From 4e602314306ef4d3dbc8688aab94f4c49c324702 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 11:24:46 +0100 Subject: [PATCH 01/28] maxvars first commit --- plugins/quickicon/maxvars/maxvars.php | 76 +++++++++++++++++++++++++++ plugins/quickicon/maxvars/maxvars.xml | 15 ++++++ 2 files changed, 91 insertions(+) create mode 100644 plugins/quickicon/maxvars/maxvars.php create mode 100644 plugins/quickicon/maxvars/maxvars.xml diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php new file mode 100644 index 0000000000000..e8dad950189d3 --- /dev/null +++ b/plugins/quickicon/maxvars/maxvars.php @@ -0,0 +1,76 @@ +loadLanguage(); + } + + /** + * This method is called when the Quick Icons module is constructing its set + * of icons. You can return an array which defines a single icon and it will + * be rendered right after the stock Quick Icons. + * + * @param $context The calling context + * + * @return array A list of icon definition associative arrays, consisting of the + * keys link, image, text and access. + * + * @since 2.5.28 + */ +public function onGetIcons($context) + { + + $text = JText::_('PLG_MAX_VARS'); + $maxinputvars = ini_get('max_input_vars'); + $varcount = + SELECT SUM(count) FROM ( + SELECT count(*) as count FROM `#_categories` as a + UNION + SELECT count(*) as count FROM `#_menu` as b + UNION + SELECT count(*) as count FROM `#_modules` as c + UNION + SELECT count(*) as count FROM `#_usergroups` as d + ) as varcount; + + if $varcount >= $maxinputvars + { + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $text), 'error'); + } + // then test if $varcount is within 10% of $maxinputvars and PLG_MAX_VARS_WARN + + + } + + + +} diff --git a/plugins/quickicon/maxvars/maxvars.xml b/plugins/quickicon/maxvars/maxvars.xml new file mode 100644 index 0000000000000..4bb0d2eb28d35 --- /dev/null +++ b/plugins/quickicon/maxvars/maxvars.xml @@ -0,0 +1,15 @@ + + + PLG_MAXVRS + Joomla! Project + October 2014 + Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + admin@joomla.org + www.joomla.org + 1.0 + MAx Vars test plugin + + maxvars.php + + From a48d9a04f21afebf1fe800c6f8fe69c042cea90c Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 12:41:27 +0200 Subject: [PATCH 02/28] Update maxvars.php --- plugins/quickicon/maxvars/maxvars.php | 60 +++++++++++++++------------ 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index e8dad950189d3..02c6f8cac1aae 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -1,10 +1,10 @@ = $maxinputvars + $varcount = 0; + + $tables = array( + '#__categories', + '#__menu', + '#__modules', + '#__usergroups', + ); + + // Get a db connection. + $db = JFactory::getDbo(); + + foreach ($tables as $tableToCheck) + { + // Create a new query object. + $query = $db->getQuery(true); + + $query->select($db->quoteName('id')); + $query->from($db->quoteName($tableToCheck)); + + $db->setQuery($query); + $db->execute(); + $varcount = $varcount + $db->getNumRows(); + } + + if ($varcount >= $maxinputvars) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $text), 'error'); } + // then test if $varcount is within 10% of $maxinputvars and PLG_MAX_VARS_WARN - - } - - - } From 763a9c27d265977b031a37e9ca351e61bebdb304 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 12:44:11 +0200 Subject: [PATCH 03/28] Update maxvars.php --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 02c6f8cac1aae..0d0ebbc1124a8 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -48,7 +48,7 @@ public function __construct(&$subject, $config = array()) public function onGetIcons($context) { $text = JText::_('PLG_MAX_VARS'); - $maxinputvars = ini_get('max_input_vars'); + $maxinputvars = @ini_get('max_input_vars'); $varcount = 0; $tables = array( From a81db14e835626c691fe4c8470f43f266dff9207 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 11:52:30 +0100 Subject: [PATCH 04/28] add warning test --- plugins/quickicon/maxvars/maxvars.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 0d0ebbc1124a8..f4a2da4196032 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -78,7 +78,9 @@ public function onGetIcons($context) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $text), 'error'); } - - // then test if $varcount is within 10% of $maxinputvars and PLG_MAX_VARS_WARN + if (((($maxinputvars - $varcount) / $maxinputvars) * 100) > 80) + { + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $text), 'error'); + } } } From 7898b954191a05a03e1bf4209cbb90ec1c756e94 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 12:06:21 +0100 Subject: [PATCH 05/28] language files and notice --- .../language/en-GB/en-GB.plg_quickicon_maxvars.ini | 7 +++++++ .../language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini | 9 +++++++++ plugins/quickicon/maxvars/maxvars.php | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini create mode 100644 administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini new file mode 100644 index 0000000000000..c4e4fe6ef0c32 --- /dev/null +++ b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini @@ -0,0 +1,7 @@ +; Joomla! Project +; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; 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 + +PLG_MAX_VARS_FAIL="You need to increase the value" +PLG_MAX_VARS_WARN="You are close to the maximum" \ No newline at end of file diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini new file mode 100644 index 0000000000000..7b4c9c75de62f --- /dev/null +++ b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini @@ -0,0 +1,9 @@ +; Joomla! Project +; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; 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 + +PLG_FINDER_NEWSFEEDS="Smart Search - News Feeds" +PLG_FINDER_NEWSFEEDS_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the "Smart Search - Joomla! News Feeds" plugin." +PLG_FINDER_NEWSFEEDS_XML_DESCRIPTION="This plugin indexes Joomla! News feeds." +PLG_FINDER_STATISTICS_NEWS_FEED="News Feed" diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index f4a2da4196032..43a2992b1847b 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -80,7 +80,7 @@ public function onGetIcons($context) } if (((($maxinputvars - $varcount) / $maxinputvars) * 100) > 80) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $text), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $text), 'warning'); } } } From 95b8a9f267898cc092c3f030c1fd391d04b04fcb Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 12:09:05 +0100 Subject: [PATCH 06/28] print value --- administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini | 4 ++-- plugins/quickicon/maxvars/maxvars.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini index c4e4fe6ef0c32..a8dcc33d0c8b9 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini @@ -3,5 +3,5 @@ ; 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 -PLG_MAX_VARS_FAIL="You need to increase the value" -PLG_MAX_VARS_WARN="You are close to the maximum" \ No newline at end of file +PLG_MAX_VARS_FAIL="You need to increase the value %s" +PLG_MAX_VARS_WARN="You are close to the maximum %s" \ No newline at end of file diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 43a2992b1847b..3cc671676dfa0 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -76,11 +76,11 @@ public function onGetIcons($context) if ($varcount >= $maxinputvars) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $text), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $varcount), 'error'); } if (((($maxinputvars - $varcount) / $maxinputvars) * 100) > 80) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $text), 'warning'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $varcount), 'warning'); } } } From d178674c5ecabfe20d1dc7e52186e483461392da Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 12:10:01 +0100 Subject: [PATCH 07/28] correct variable --- plugins/quickicon/maxvars/maxvars.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 3cc671676dfa0..7b0eecdb87e97 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -76,11 +76,11 @@ public function onGetIcons($context) if ($varcount >= $maxinputvars) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $varcount), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $maxinputvars), 'error'); } if (((($maxinputvars - $varcount) / $maxinputvars) * 100) > 80) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $varcount), 'warning'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $maxinputvars), 'warning'); } } } From 6830aac43f0bbd4e8a2db6437e1c7f0b715207fa Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 12:10:35 +0100 Subject: [PATCH 08/28] fix --- plugins/quickicon/maxvars/maxvars.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 7b0eecdb87e97..3cc671676dfa0 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -76,11 +76,11 @@ public function onGetIcons($context) if ($varcount >= $maxinputvars) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $maxinputvars), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $varcount), 'error'); } if (((($maxinputvars - $varcount) / $maxinputvars) * 100) > 80) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $maxinputvars), 'warning'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $varcount), 'warning'); } } } From 0ed6ec9806f4f982a0f1b3d620576854e0f2440d Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 13:39:40 +0100 Subject: [PATCH 09/28] fix the count --- plugins/quickicon/maxvars/maxvars.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 3cc671676dfa0..f6d68fc2bd4fb 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -60,25 +60,24 @@ public function onGetIcons($context) // Get a db connection. $db = JFactory::getDbo(); + $query = $db->getQuery(true); foreach ($tables as $tableToCheck) { - // Create a new query object. - $query = $db->getQuery(true); + $query->clear(); - $query->select($db->quoteName('id')); + $query->select('count(*)'); $query->from($db->quoteName($tableToCheck)); $db->setQuery($query); - $db->execute(); - $varcount = $varcount + $db->getNumRows(); + $varcount = $varcount + (int) $db->loadResult(); } - + if ($varcount >= $maxinputvars) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $varcount), 'error'); } - if (((($maxinputvars - $varcount) / $maxinputvars) * 100) > 80) + if (((($varcount- $maxinputvars) / $maxinputvars) * 100) > 80) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $varcount), 'warning'); } From 8395644cb5365ed4382af23bcacb66d3c40f6eb1 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 16:24:34 +0200 Subject: [PATCH 10/28] Update maxvars.php --- plugins/quickicon/maxvars/maxvars.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index f6d68fc2bd4fb..e4196d684a010 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -12,7 +12,7 @@ /** * Joomla! php max vars Plugin * - * @since 3.5 + * @since 3.5 */ class PlgQuickiconMaxvars extends JPlugin { @@ -59,7 +59,7 @@ public function onGetIcons($context) ); // Get a db connection. - $db = JFactory::getDbo(); + $db = JFactory::getDbo(); $query = $db->getQuery(true); foreach ($tables as $tableToCheck) @@ -72,11 +72,12 @@ public function onGetIcons($context) $db->setQuery($query); $varcount = $varcount + (int) $db->loadResult(); } - + if ($varcount >= $maxinputvars) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $varcount), 'error'); } + if (((($varcount- $maxinputvars) / $maxinputvars) * 100) > 80) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $varcount), 'warning'); From aca21fab81cdee0d02a34c38908d8bed20a93be3 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 16:26:10 +0200 Subject: [PATCH 11/28] Update maxvars.php --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index e4196d684a010..03a0697a76b3c 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -59,7 +59,7 @@ public function onGetIcons($context) ); // Get a db connection. - $db = JFactory::getDbo(); + $db = JFactory::getDbo(); $query = $db->getQuery(true); foreach ($tables as $tableToCheck) From e6a1ff8d9067adcaf9482a68a45a4ddbdba101b3 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 16:30:29 +0200 Subject: [PATCH 12/28] Update maxvars.xml --- plugins/quickicon/maxvars/maxvars.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.xml b/plugins/quickicon/maxvars/maxvars.xml index 4bb0d2eb28d35..fc2323bdf0655 100644 --- a/plugins/quickicon/maxvars/maxvars.xml +++ b/plugins/quickicon/maxvars/maxvars.xml @@ -1,15 +1,19 @@ - - PLG_MAXVRS + + PLG_MAXVARS Joomla! Project - October 2014 - Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. + July 2015 + Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org - 1.0 - MAx Vars test plugin + 3.5.0 + PLG_MAXVARS_XML_DESCRIPTION maxvars.php + + en-GB.plg_quickicon_maxvars.ini + en-GB.plg_quickicon_maxvars.sys.ini + From d6115d94ee686a6d8eebdca9c4392b4643ac5119 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 16:54:01 +0200 Subject: [PATCH 13/28] Update maxvars.php --- plugins/quickicon/maxvars/maxvars.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 03a0697a76b3c..18a36952b8dcc 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -47,7 +47,6 @@ public function __construct(&$subject, $config = array()) */ public function onGetIcons($context) { - $text = JText::_('PLG_MAX_VARS'); $maxinputvars = @ini_get('max_input_vars'); $varcount = 0; @@ -75,12 +74,12 @@ public function onGetIcons($context) if ($varcount >= $maxinputvars) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_FAIL', $varcount), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAXVARS_FAIL', $varcount), 'error'); } if (((($varcount- $maxinputvars) / $maxinputvars) * 100) > 80) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAX_VARS_WARN', $varcount), 'warning'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAXVARS_WARN', $varcount), 'warning'); } } } From 6d7ea8102a8fabc56cdb7727bec1cd26d0ee32b3 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 17:29:35 +0200 Subject: [PATCH 14/28] Update script.php --- administrator/components/com_admin/script.php | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 34f8e0ae365eb..5130816b879bb 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -273,6 +273,7 @@ protected function updateManifestCaches() array('plugin', 'tags', 'finder', 0), array('plugin', 'totp', 'twofactorauth', 0), array('plugin', 'yubikey', 'twofactorauth', 0), + array('plugin', 'maxvars', 'quickicon', 0), // Templates array('template', 'beez3', '', 0), From f8a9e40eb53da6598973c2a5437770a1471e55e2 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 17:37:22 +0200 Subject: [PATCH 15/28] Create 3.5.0-2015-07-17.sql --- .../components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql new file mode 100644 index 0000000000000..2b7862c9bc6ee --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql @@ -0,0 +1,2 @@ +INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES +(453, 'PLG_MAXVARS', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); From f36b8f050b4a8623c0c07ab49136df8ae44f9198 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 17:38:03 +0200 Subject: [PATCH 16/28] Create 3.5.0-2015-07-17.sql --- .../com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql new file mode 100644 index 0000000000000..1858f0d2be463 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql @@ -0,0 +1,2 @@ +INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES +(453, 'PLG_MAXVARS', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); From 24b2d1dfd6d8eb0a61f079d0488aa4873d04fd78 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 17 Jul 2015 17:38:46 +0200 Subject: [PATCH 17/28] Create 3.5.0-2015-07-17.sql --- .../com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql new file mode 100644 index 0000000000000..34d7e6bb56ed4 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql @@ -0,0 +1,2 @@ +INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) +SELECT 453, 'PLG_MAXVARS', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; From 942b499cdd3ed790dd89aece63a978d0597d2aab Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 17:28:06 +0100 Subject: [PATCH 18/28] Update language --- .../language/en-GB/en-GB.plg_quickicon_maxvars.ini | 7 ------- .../language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini | 6 ++---- plugins/quickicon/maxvars/maxvars.php | 4 ++-- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini deleted file mode 100644 index a8dcc33d0c8b9..0000000000000 --- a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini +++ /dev/null @@ -1,7 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. -; 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 - -PLG_MAX_VARS_FAIL="You need to increase the value %s" -PLG_MAX_VARS_WARN="You are close to the maximum %s" \ No newline at end of file diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini index 7b4c9c75de62f..96d5473f2eccd 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.sys.ini @@ -3,7 +3,5 @@ ; 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 -PLG_FINDER_NEWSFEEDS="Smart Search - News Feeds" -PLG_FINDER_NEWSFEEDS_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the "Smart Search - Joomla! News Feeds" plugin." -PLG_FINDER_NEWSFEEDS_XML_DESCRIPTION="This plugin indexes Joomla! News feeds." -PLG_FINDER_STATISTICS_NEWS_FEED="News Feed" +PLG_QUICKICON_MAXVARS="Quick Icon - Joomla! php max_input_vars check" +PLG_QUICKICON_MAXVARS_XML_DESCRIPTION="Checks the setting of php max_input_vars and notifies you when you visit the Control Panel page if you have reached the server limit." \ No newline at end of file diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 18a36952b8dcc..39792bdf66da2 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -74,12 +74,12 @@ public function onGetIcons($context) if ($varcount >= $maxinputvars) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAXVARS_FAIL', $varcount), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_FAIL', $maxinputvars, $varcount), 'error'); } if (((($varcount- $maxinputvars) / $maxinputvars) * 100) > 80) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_MAXVARS_WARN', $varcount), 'warning'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_WARN', $maxinputvars, $varcount), 'warning'); } } } From 163059003c1249144f514e3a52f024a2c3d4e273 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 17:28:33 +0100 Subject: [PATCH 19/28] Update language --- .../language/en-GB/en-GB.plg_quickicon_maxvars.ini | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini new file mode 100644 index 0000000000000..a1ce8addfea6c --- /dev/null +++ b/administrator/language/en-GB/en-GB.plg_quickicon_maxvars.ini @@ -0,0 +1,7 @@ +; Joomla! Project +; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; 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 + +PLG_QUICKICON_MAXVARS_WARN="Your PHP configuration has an input limit of %s variables and your website is using approximately %s. This may create issues making changes to your website.
Please contact your hosting provider and ask them to increase the limit of the PHP setting max_input_vars." +PLG_QUICKICON_MAXVARS_FAIL="Your PHP configuration has an input limit of %s variables and your website has reached that limit and is using approximately %s.
This will create issues making changes to your website.
Please contact your hosting provider and ask them to increase the limit of the PHP setting max_input_vars." From c3232e9e5631f8cedfa1b3be850199fb9ee422f3 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 17:43:47 +0100 Subject: [PATCH 20/28] correct update scripts --- .../components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql | 2 +- .../com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql | 2 +- .../com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql index 2b7862c9bc6ee..39b28a6101d2b 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-17.sql @@ -1,2 +1,2 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(453, 'PLG_MAXVARS', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(453, 'plg_quickicon_maxvars', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql index 1858f0d2be463..199f967da6329 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-17.sql @@ -1,2 +1,2 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(453, 'PLG_MAXVARS', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(453, 'plg_quickicon_maxvars', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql index 34d7e6bb56ed4..79efa2986501d 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-17.sql @@ -1,2 +1,2 @@ INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) -SELECT 453, 'PLG_MAXVARS', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 453, 'plg_quickicon_maxvars', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; From aec570cd781962dae2ee09e54f9128bb9bc4c715 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 17:46:49 +0100 Subject: [PATCH 21/28] Add new install scripts --- installation/sql/mysql/joomla.sql | 1 + installation/sql/postgresql/joomla.sql | 1 + installation/sql/sqlazure/joomla.sql | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index c7e3aa5b3bfad..b4e8e1850b575 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -610,6 +610,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(453, 'plg_quickicon_maxvars', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); (503, 'beez3', 'template', 'beez3', '', 0, 1, 1, 0, '', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (504, 'hathor', 'template', 'hathor', '', 1, 1, 1, 0, '', '{"showSiteName":"0","colourChoice":"0","boldText":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (506, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index ca199d90eb950..0dbe7e6fabc86 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -611,6 +611,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" (449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(453, 'plg_quickicon_maxvars', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- Templates INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index 7f99a9968d6db..bb0d0ad5319c3 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -1012,7 +1012,8 @@ UNION ALL SELECT 450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 UNION ALL SELECT 451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0; - +UNION ALL +SELECT 453, 'plg_quickicon_maxvars', 'plugin', 'maxvars', 'quickicon', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) SELECT 503, 'beez3', 'template', 'beez3', '', 0, 1, 1, 0, '', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '1900-01-01 00:00:00', 0, 0 From 18164b1f7a2b736a0d74d23aa54a63b6d75a1493 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 17:50:42 +0100 Subject: [PATCH 22/28] correct XML --- plugins/quickicon/maxvars/maxvars.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.xml b/plugins/quickicon/maxvars/maxvars.xml index fc2323bdf0655..2f0695b1f02d9 100644 --- a/plugins/quickicon/maxvars/maxvars.xml +++ b/plugins/quickicon/maxvars/maxvars.xml @@ -1,6 +1,6 @@ - PLG_MAXVARS + PLG_QUICKICON_MAXVARS Joomla! Project July 2015 Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. @@ -8,7 +8,7 @@ admin@joomla.org www.joomla.org 3.5.0 - PLG_MAXVARS_XML_DESCRIPTION + PLG_QUICKICON_MAXVARS_XML_DESCRIPTION maxvars.php From 9c2dd002595c6910eabe1356cf418c33bfb6ae19 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 18:26:10 +0100 Subject: [PATCH 23/28] codestyle --- plugins/quickicon/maxvars/maxvars.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 39792bdf66da2..8e443a724f7e6 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -1,10 +1,10 @@ enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_FAIL', $maxinputvars, $varcount), 'error'); } - if (((($varcount- $maxinputvars) / $maxinputvars) * 100) > 80) + if (((($varcount - $maxinputvars) / $maxinputvars) * 100) > 80) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_WARN', $maxinputvars, $varcount), 'warning'); } - } + } } From 65206a4300f6a37f2ab69312e81de76f4c81f1ac Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 18:28:54 +0100 Subject: [PATCH 24/28] code style --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 8e443a724f7e6..88e65ce85b537 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -38,7 +38,7 @@ public function __construct(&$subject, $config = array()) * of icons. You can return an array which defines a single icon and it will * be rendered right after the stock Quick Icons. * - * @param $context The calling context + * @param string $context The calling context * * @return array A list of icon definition associative arrays, consisting of the * keys link, image, text and access. From 3b40ffd66ba8cc89c3cb3fda8e9bb91e4051dd2e Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 17 Jul 2015 19:30:33 +0100 Subject: [PATCH 25/28] codestyle again --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 88e65ce85b537..0f3645c11ef42 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -1,6 +1,6 @@ Date: Fri, 17 Jul 2015 22:24:12 +0100 Subject: [PATCH 26/28] correct the maths --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 0f3645c11ef42..adb60d1bcad49 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -77,7 +77,7 @@ public function onGetIcons($context) JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_FAIL', $maxinputvars, $varcount), 'error'); } - if (((($varcount - $maxinputvars) / $maxinputvars) * 100) > 80) + if (($varcount / $maxinputvars) > 0.8) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_WARN', $maxinputvars, $varcount), 'warning'); } From 7bcf8cdf96e838ebd8d0cfcd09d8de84abe640d7 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sat, 18 Jul 2015 11:05:45 +0100 Subject: [PATCH 27/28] codestlye --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index adb60d1bcad49..0badcc8d10cb9 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -77,7 +77,7 @@ public function onGetIcons($context) JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_FAIL', $maxinputvars, $varcount), 'error'); } - if (($varcount / $maxinputvars) > 0.8) + if (($varcount / $maxinputvars) > 0.8) > 80) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_WARN', $maxinputvars, $varcount), 'warning'); } From d30e51018cd3cca58381c36240630ee2a9311f7b Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Wed, 22 Jul 2015 09:30:45 +0100 Subject: [PATCH 28/28] codestyle --- plugins/quickicon/maxvars/maxvars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/quickicon/maxvars/maxvars.php b/plugins/quickicon/maxvars/maxvars.php index 0badcc8d10cb9..8c4d5d0717b27 100644 --- a/plugins/quickicon/maxvars/maxvars.php +++ b/plugins/quickicon/maxvars/maxvars.php @@ -77,7 +77,7 @@ public function onGetIcons($context) JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_FAIL', $maxinputvars, $varcount), 'error'); } - if (($varcount / $maxinputvars) > 0.8) > 80) + if (($varcount / $maxinputvars) > 0.8) > 80) { JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_QUICKICON_MAXVARS_WARN', $maxinputvars, $varcount), 'warning'); }