id; ?>
diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.ini
index 7377d7c..5f8d45e 100644
--- a/src/administrator/language/en-GB/en-GB.com_weblinks.ini
+++ b/src/administrator/language/en-GB/en-GB.com_weblinks.ini
@@ -81,7 +81,7 @@ COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
COM_WEBLINKS_FIELDSET_IMAGES="Images"
COM_WEBLINKS_FIELDSET_OPTIONS="Options"
COM_WEBLINKS_FILTER_CATEGORY="Filter Category"
-COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with id: to search for an web link ID."
+COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for a web link ID."
COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
COM_WEBLINKS_FILTER_STATE="Filter State"
COM_WEBLINKS_FLOAT_DESC="Controls placement of the image."
diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
index 144f9ba..bbc0da1 100644
--- a/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
+++ b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
@@ -19,5 +19,7 @@ COM_WEBLINKS_FORM_VIEW_DEFAULT_DESC="Display a form to submit a web link in the
COM_WEBLINKS_FORM_VIEW_DEFAULT_OPTION="Default"
COM_WEBLINKS_FORM_VIEW_DEFAULT_TITLE="Submit a Web Link"
COM_WEBLINKS_LINKS="Links"
+COM_WEBLINKS_TAGS_WEBLINK="Web Link"
+COM_WEBLINKS_TAGS_CATEGORY="Web Link Category"
COM_WEBLINKS_XML_DESCRIPTION="Component for web links management."
diff --git a/src/administrator/manifests/packages/pkg_weblinks.xml b/src/administrator/manifests/packages/pkg_weblinks.xml
index e3f75f7..7fcc815 100644
--- a/src/administrator/manifests/packages/pkg_weblinks.xml
+++ b/src/administrator/manifests/packages/pkg_weblinks.xml
@@ -20,6 +20,7 @@
mod_weblinks.zipplg_finder_weblinks.zipplg_search_weblinks.zip
+ plg_system_weblinks.zipen-GB/en-GB.pkg_weblinks.sys.ini
diff --git a/src/components/com_weblinks/models/form.php b/src/components/com_weblinks/models/form.php
index e8ec255..81d71da 100644
--- a/src/components/com_weblinks/models/form.php
+++ b/src/components/com_weblinks/models/form.php
@@ -76,4 +76,28 @@ class WeblinksModelForm extends WeblinksModelWeblink
$this->setState('layout', $app->input->getString('layout'));
}
+
+ /**
+ * Abstract method for getting the form from the model.
+ *
+ * @param array $data Data for the form.
+ * @param boolean $loadData True if the form is to load its own data (default case), false if not.
+ *
+ * @return mixed A JForm object on success, false on failure
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public function getForm($data = array(), $loadData = true)
+ {
+ $form = $this->loadForm('com_weblinks.form', 'weblink', array('control' => 'jform', 'load_data' => $loadData));
+
+ // Disable the buttons and just allow editor none for not authenticated users
+ if (JFactory::getUser()->guest)
+ {
+ $form->setFieldAttribute('description', 'editor', 'none');
+ $form->setFieldAttribute('description', 'buttons', 'no');
+ }
+
+ return $form;
+ }
}
diff --git a/src/components/com_weblinks/models/forms/weblink.xml b/src/components/com_weblinks/models/forms/weblink.xml
index ad350d0..34478a3 100644
--- a/src/components/com_weblinks/models/forms/weblink.xml
+++ b/src/components/com_weblinks/models/forms/weblink.xml
@@ -1,7 +1,9 @@
diff --git a/src/components/com_weblinks/views/categories/tmpl/default.xml b/src/components/com_weblinks/views/categories/tmpl/default.xml
index 98c9da8..6a290c8 100644
--- a/src/components/com_weblinks/views/categories/tmpl/default.xml
+++ b/src/components/com_weblinks/views/categories/tmpl/default.xml
@@ -13,10 +13,12 @@
-
diff --git a/src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini b/src/plugins/search/weblinks/language/en-GB/en-GB.plg_search_weblinks.ini
similarity index 100%
rename from src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
rename to src/plugins/search/weblinks/language/en-GB/en-GB.plg_search_weblinks.ini
diff --git a/src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/src/plugins/search/weblinks/language/en-GB/en-GB.plg_search_weblinks.sys.ini
similarity index 100%
rename from src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
rename to src/plugins/search/weblinks/language/en-GB/en-GB.plg_search_weblinks.sys.ini
diff --git a/src/plugins/search/weblinks/weblinks.php b/src/plugins/search/weblinks/weblinks.php
index 7b90b77..9231b2f 100644
--- a/src/plugins/search/weblinks/weblinks.php
+++ b/src/plugins/search/weblinks/weblinks.php
@@ -183,7 +183,7 @@ class PlgSearchWeblinks extends JPlugin
->order($order);
// Filter by language.
- if (JFactory::getApplication()->isSite() && JLanguageMultilang::isEnabled())
+ if (JFactory::getApplication()->isClient('site') && JLanguageMultilang::isEnabled())
{
$tag = JFactory::getLanguage()->getTag();
$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
diff --git a/src/plugins/search/weblinks/weblinks.xml b/src/plugins/search/weblinks/weblinks.xml
index d5a8e33..47a3cc7 100644
--- a/src/plugins/search/weblinks/weblinks.xml
+++ b/src/plugins/search/weblinks/weblinks.xml
@@ -12,36 +12,41 @@
##FILES##
-
+
##LANGUAGE_FILES##
-
-
-
+ >
-
+ >
diff --git a/src/plugins/system/weblinks/language/en-GB/en-GB.plg_system_weblinks.ini b/src/plugins/system/weblinks/language/en-GB/en-GB.plg_system_weblinks.ini
new file mode 100644
index 0000000..a2b402d
--- /dev/null
+++ b/src/plugins/system/weblinks/language/en-GB/en-GB.plg_system_weblinks.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2016 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_SYSTEM_WEBLINKS="System - Web Links"
+PLG_SYSTEM_WEBLINKS_STATISTICS="Web Links"
+PLG_SYSTEM_WEBLINKS_XML_DESCRIPTION="This plugin returns statistical information about Joomla! Web Links."
diff --git a/src/plugins/system/weblinks/language/en-GB/en-GB.plg_system_weblinks.sys.ini b/src/plugins/system/weblinks/language/en-GB/en-GB.plg_system_weblinks.sys.ini
new file mode 100644
index 0000000..f9e4af1
--- /dev/null
+++ b/src/plugins/system/weblinks/language/en-GB/en-GB.plg_system_weblinks.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2016 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_SYSTEM_WEBLINKS="System - Web Links"
+PLG_SYSTEM_WEBLINKS_XML_DESCRIPTION="This plugin returns statistical information about Joomla! Web Links."
diff --git a/src/plugins/system/weblinks/weblinks.php b/src/plugins/system/weblinks/weblinks.php
new file mode 100644
index 0000000..27e5da4
--- /dev/null
+++ b/src/plugins/system/weblinks/weblinks.php
@@ -0,0 +1,77 @@
+supportedExtensions))
+ {
+ return array();
+ }
+
+ if (!JComponentHelper::isEnabled('com_weblinks'))
+ {
+ return array();
+ }
+
+ $db = JFactory::getDbo();
+ $query = $db->getQuery(true)
+ ->select('COUNT(id) AS count_links')
+ ->from('#__weblinks')
+ ->where('state = 1');
+ $webLinks = $db->setQuery($query)->loadResult();
+
+ if (!$webLinks)
+ {
+ return array();
+ }
+
+ return array(array(
+ 'title' => JText::_('PLG_SYSTEM_WEBLINKS_STATISTICS'),
+ 'icon' => 'out-2',
+ 'data' => $webLinks
+ ));
+ }
+}
diff --git a/src/plugins/system/weblinks/weblinks.xml b/src/plugins/system/weblinks/weblinks.xml
new file mode 100644
index 0000000..604c0f6
--- /dev/null
+++ b/src/plugins/system/weblinks/weblinks.xml
@@ -0,0 +1,18 @@
+
+
+ plg_system_weblinks
+ Joomla! Project
+ ##DATE##
+ (C) 2005 - ##YEAR## Open Source Matters. All rights reserved.
+ GNU General Public License version 2 or later; see LICENSE.txt
+ admin@joomla.org
+ www.joomla.org
+ ##VERSION##
+ PLG_SYSTEM_WEBLINKS_XML_DESCRIPTION
+
+ ##FILES##
+
+
+ ##LANGUAGE_FILES##
+
+
diff --git a/tests/_support/Step/Acceptance/category.php b/tests/_support/Step/Acceptance/category.php
index ffc872c..37d3311 100644
--- a/tests/_support/Step/Acceptance/category.php
+++ b/tests/_support/Step/Acceptance/category.php
@@ -7,7 +7,7 @@
* @todo: this class should grow until being able to execute generic operations over a category: change status, add to category...
*
* @package Step\Acceptance
- * @see http://codeception.com/docs/06-ReusingTestCode#StepObjects
+ * @link http://codeception.com/docs/06-ReusingTestCode#StepObjects
*/
namespace Step\Acceptance;
/**
diff --git a/tests/_support/Step/Acceptance/weblink.php b/tests/_support/Step/Acceptance/weblink.php
index e7bed69..702d667 100644
--- a/tests/_support/Step/Acceptance/weblink.php
+++ b/tests/_support/Step/Acceptance/weblink.php
@@ -9,7 +9,7 @@ namespace Step\Acceptance;
* @todo: this class should grow until being able to execute generic operations over a Weblink: change status, add to category...
*
* @package Step\Acceptance
- * @see http://codeception.com/docs/06-ReusingTestCode#StepObjects
+ * @link http://codeception.com/docs/06-ReusingTestCode#StepObjects
*/
class weblink extends \AcceptanceTester
{
diff --git a/tests/acceptance/administrator/AdministratorCategoriesCest.php b/tests/acceptance/administrator/AdministratorCategoriesCest.php
index 5519af9..a40382e 100644
--- a/tests/acceptance/administrator/AdministratorCategoriesCest.php
+++ b/tests/acceptance/administrator/AdministratorCategoriesCest.php
@@ -15,7 +15,7 @@ class AdministratorCategoriesCest
/**
* Creates random names for the objects that will be used by the tests
*
- * @see https://github.com/fzaninotto/Faker#fakerproviderbase
+ * @link https://github.com/fzaninotto/Faker#fakerproviderbase
*/
public function __construct()
{