diff --git a/.gitignore b/.gitignore
index ff5424ddd83b2..4df83665e1220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,19 @@
 # phpDocumentor Logs #
 phpdoc-*
 
-# Patch Tester
+# Patch Tester #
 administrator/components/com_patchtester/
 administrator/templates/hathor/html/com_patchtester
 components/com_patchtester/
 
+# OSX #
+._*
+.Spotlight-V100
+.Trashes
+
+# Windows #
+Thumbs.db
+Desktop.ini
+
+# Never ignore #
+!.gitignore
diff --git a/.travis.yml b/.travis.yml
index 28017ed6f766c..c5ebdb1f7bcc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ php:
 
 before_script:
   - composer self-update
+  - pyrus install -f pear/PHP_CodeSniffer-1.5.4
+  - phpenv rehash
   - mysql -e 'create database joomla_ut;'
   - mysql joomla_ut < tests/unit/suites/database/stubs/mysql.sql
   - psql -c 'create database joomla_ut;' -U postgres
@@ -15,6 +17,7 @@ before_script:
 
 script:
   - phpunit --configuration travisci-phpunit.xml
+  - phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .
 
 branches:
   except:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1035a7b35bf9e..614571c6dd05f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,14 +2,10 @@ Contributing to the Joomla! CMS
 ===============
 All contributions are welcome to be submitted for review for inclusion in the Joomla! CMS, but before they will be accepted, we ask that you follow these simple steps:
 
-1) Open an item on the Joomlacode tracker in the appropriate area.
-* CMS Bug Reports: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8103
-* CMS Feature Requests: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8549
+1) Open an issue on our [Issue Tracker](http://issues.joomla.org/) or here on GitHub. If you can provide a fix create a pull request instead, it will automatically create the issue for you.
 
 2) Follow the [Joomla! Coding Standards](http://joomla.github.io/coding-standards)!
 
-3) After submitting the item to the Joomlacode tracker, add a link to the Joomlacode tracker item and the GitHub issue or pull request.
-
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
diff --git a/administrator/components/com_admin/controller.php b/administrator/components/com_admin/controller.php
index 76ac053769e4c..c8a4ea86bd5b2 100644
--- a/administrator/components/com_admin/controller.php
+++ b/administrator/components/com_admin/controller.php
@@ -12,9 +12,7 @@
 /**
  * Admin Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminController extends JControllerLegacy
 {
diff --git a/administrator/components/com_admin/controllers/profile.php b/administrator/components/com_admin/controllers/profile.php
index 984c459cfd7cd..4884ef27a86b6 100644
--- a/administrator/components/com_admin/controllers/profile.php
+++ b/administrator/components/com_admin/controllers/profile.php
@@ -12,9 +12,7 @@
 /**
  * User profile controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminControllerProfile extends JControllerForm
 {
diff --git a/administrator/components/com_admin/helpers/html/directory.php b/administrator/components/com_admin/helpers/html/directory.php
index 9ea9a8b45887a..5346819242767 100644
--- a/administrator/components/com_admin/helpers/html/directory.php
+++ b/administrator/components/com_admin/helpers/html/directory.php
@@ -12,9 +12,7 @@
 /**
  * Utility class working with directory
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlDirectory
 {
diff --git a/administrator/components/com_admin/helpers/html/phpsetting.php b/administrator/components/com_admin/helpers/html/phpsetting.php
index 3577eeb11dd37..717ac6407d207 100644
--- a/administrator/components/com_admin/helpers/html/phpsetting.php
+++ b/administrator/components/com_admin/helpers/html/phpsetting.php
@@ -12,9 +12,7 @@
 /**
  * Utility class working with phpsetting
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlPhpSetting
 {
diff --git a/administrator/components/com_admin/helpers/html/system.php b/administrator/components/com_admin/helpers/html/system.php
index c4fa369fae817..2c5150e73fde0 100644
--- a/administrator/components/com_admin/helpers/html/system.php
+++ b/administrator/components/com_admin/helpers/html/system.php
@@ -12,9 +12,7 @@
 /**
  * Utility class working with system
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlSystem
 {
diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php
index 9e6139c8a3fee..1898b1b148d34 100644
--- a/administrator/components/com_admin/models/help.php
+++ b/administrator/components/com_admin/models/help.php
@@ -12,9 +12,7 @@
 /**
  * Admin Component Help Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminModelHelp extends JModelLegacy
 {
diff --git a/administrator/components/com_admin/models/profile.php b/administrator/components/com_admin/models/profile.php
index 8d1935caeda59..e404b22270e49 100644
--- a/administrator/components/com_admin/models/profile.php
+++ b/administrator/components/com_admin/models/profile.php
@@ -14,9 +14,7 @@
 /**
  * User model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminModelProfile extends UsersModelUser
 {
diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
index 0936ec6faa01f..9956e0709ac9c 100644
--- a/administrator/components/com_admin/models/sysinfo.php
+++ b/administrator/components/com_admin/models/sysinfo.php
@@ -12,9 +12,7 @@
 /**
  * Model for the display of system information.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminModelSysInfo extends JModelLegacy
 {
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index fa8495e779a68..2a741e209e6bd 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -12,9 +12,7 @@
 /**
  * Script file of Joomla CMS
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6.4
+ * @since  1.6.4
  */
 class JoomlaInstallerScript
 {
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql b/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql
new file mode 100644
index 0000000000000..73b7c1ba0ed3f
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql
@@ -0,0 +1,5 @@
+INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`) VALUES
+('Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1);
+
+INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES
+((SELECT `update_site_id` FROM `#__update_sites` WHERE `name` = 'Joomla! Update Component Update Site'), (SELECT `extension_id` FROM `#__extensions` WHERE `name` = 'com_joomlaupdate'));
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql b/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql
new file mode 100644
index 0000000000000..fae9c20d45522
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql
@@ -0,0 +1,5 @@
+INSERT INTO "#__update_sites" ("name", "type", "location", "enabled") VALUES
+('Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1);
+
+INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES
+((SELECT "update_site_id" FROM "#__update_sites" WHERE "name" = 'Joomla! Update Component Update Site'), (SELECT "extension_id" FROM "#__extensions" WHERE "name" = 'com_joomlaupdate'));
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql
new file mode 100644
index 0000000000000..309ade5b7c50a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql
@@ -0,0 +1,5 @@
+INSERT INTO [#__update_sites] ([name], [type], [location], [enabled])
+SELECT 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1;
+
+INSERT INTO [#__update_sites_extensions] ([update_site_id], [extension_id])
+SELECT (SELECT [update_site_id] FROM [#__update_sites] WHERE [name] = 'Joomla! Update Component Update Site'), (SELECT [extension_id] FROM [#__extensions] WHERE [name] = 'com_joomlaupdate');
diff --git a/administrator/components/com_admin/views/help/view.html.php b/administrator/components/com_admin/views/help/view.html.php
index 01d6290d9c585..7793937fb46ff 100644
--- a/administrator/components/com_admin/views/help/view.html.php
+++ b/administrator/components/com_admin/views/help/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Admin component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminViewHelp extends JViewLegacy
 {
@@ -49,7 +47,11 @@ class AdminViewHelp extends JViewLegacy
 	protected $start_here = null;
 
 	/**
-	 * Display the view
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -66,6 +68,8 @@ public function display($tpl = null)
 	/**
 	 * Setup the Toolbar
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_admin/views/profile/view.html.php b/administrator/components/com_admin/views/profile/view.html.php
index ed8f3be531886..d2d2a11016f20 100644
--- a/administrator/components/com_admin/views/profile/view.html.php
+++ b/administrator/components/com_admin/views/profile/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class to allow users edit their own profile.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminViewProfile extends JViewLegacy
 {
@@ -25,7 +23,11 @@ class AdminViewProfile extends JViewLegacy
 	protected $state;
 
 	/**
-	 * Display the view
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -37,6 +39,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -50,6 +53,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php
index 331a6cf86318e..74eb722eedfc9 100644
--- a/administrator/components/com_admin/views/sysinfo/view.html.php
+++ b/administrator/components/com_admin/views/sysinfo/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Sysinfo View class for the Admin component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminViewSysinfo extends JViewLegacy
 {
@@ -44,7 +42,11 @@ class AdminViewSysinfo extends JViewLegacy
 	protected $directory = null;
 
 	/**
-	 * Display the view
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -89,6 +91,8 @@ protected function _setSubMenu()
 	/**
 	 * Setup the Toolbar
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_banners/controller.php b/administrator/components/com_banners/controller.php
index 0c8e9236ccbef..dc1997b28c92f 100644
--- a/administrator/components/com_banners/controller.php
+++ b/administrator/components/com_banners/controller.php
@@ -12,19 +12,18 @@
 /**
  * Banners master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersController extends JControllerLegacy
 {
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController		This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
@@ -39,7 +38,6 @@ public function display($cachable = false, $urlparams = false)
 		// Check for edit form.
 		if ($view == 'banner' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.banner', $id))
 		{
-
 			// Somehow the person just went to the form - we don't allow that.
 			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
 			$this->setMessage($this->getError(), 'error');
@@ -49,7 +47,6 @@ public function display($cachable = false, $urlparams = false)
 		}
 		elseif ($view == 'client' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.client', $id))
 		{
-
 			// Somehow the person just went to the form - we don't allow that.
 			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
 			$this->setMessage($this->getError(), 'error');
diff --git a/administrator/components/com_banners/controllers/banner.php b/administrator/components/com_banners/controllers/banner.php
index 4b32be74abc33..033ca79e87f1e 100644
--- a/administrator/components/com_banners/controllers/banner.php
+++ b/administrator/components/com_banners/controllers/banner.php
@@ -12,9 +12,7 @@
 /**
  * Banner controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerBanner extends JControllerForm
 {
diff --git a/administrator/components/com_banners/controllers/banners.php b/administrator/components/com_banners/controllers/banners.php
index bb147df43fd2b..e1232d59defb7 100644
--- a/administrator/components/com_banners/controllers/banners.php
+++ b/administrator/components/com_banners/controllers/banners.php
@@ -12,9 +12,7 @@
 /**
  * Banners list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerBanners extends JControllerAdmin
 {
diff --git a/administrator/components/com_banners/controllers/client.php b/administrator/components/com_banners/controllers/client.php
index 1554db24ceabf..6c397f3c15f44 100644
--- a/administrator/components/com_banners/controllers/client.php
+++ b/administrator/components/com_banners/controllers/client.php
@@ -12,9 +12,7 @@
 /**
  * Client controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerClient extends JControllerForm
 {
diff --git a/administrator/components/com_banners/controllers/clients.php b/administrator/components/com_banners/controllers/clients.php
index cd53ddf570e19..b7ad9fbdefa8a 100644
--- a/administrator/components/com_banners/controllers/clients.php
+++ b/administrator/components/com_banners/controllers/clients.php
@@ -12,9 +12,7 @@
 /**
  * Clients list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerClients extends JControllerAdmin
 {
diff --git a/administrator/components/com_banners/controllers/tracks.php b/administrator/components/com_banners/controllers/tracks.php
index 0c2905bc8aa4d..d6bdfc5bf01aa 100644
--- a/administrator/components/com_banners/controllers/tracks.php
+++ b/administrator/components/com_banners/controllers/tracks.php
@@ -12,9 +12,7 @@
 /**
  * Tracks list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerTracks extends JControllerLegacy
 {
diff --git a/administrator/components/com_banners/controllers/tracks.raw.php b/administrator/components/com_banners/controllers/tracks.raw.php
index 6b9db7052efd4..b144c1161c1f0 100644
--- a/administrator/components/com_banners/controllers/tracks.raw.php
+++ b/administrator/components/com_banners/controllers/tracks.raw.php
@@ -12,9 +12,7 @@
 /**
  * Tracks list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerTracks extends JControllerLegacy
 {
diff --git a/administrator/components/com_banners/helpers/banners.php b/administrator/components/com_banners/helpers/banners.php
index f127522b81c34..41e2ad9a695f7 100644
--- a/administrator/components/com_banners/helpers/banners.php
+++ b/administrator/components/com_banners/helpers/banners.php
@@ -12,9 +12,7 @@
 /**
  * Banners component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersHelper extends JHelperContent
 {
diff --git a/administrator/components/com_banners/helpers/html/banner.php b/administrator/components/com_banners/helpers/html/banner.php
index 30ee8a60bfd6c..1eda74bbe43e6 100644
--- a/administrator/components/com_banners/helpers/html/banner.php
+++ b/administrator/components/com_banners/helpers/html/banner.php
@@ -12,9 +12,7 @@
 /**
  * Banner HTML class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       2.5
+ * @since  2.5
  */
 abstract class JHtmlBanner
 {
@@ -31,7 +29,9 @@ public static function clients()
 
 		// Create the batch selector to change the client on a selection list.
 		$lines = array(
-			'<label id="batch-client-lbl" for="batch-client" class="hasTooltip" title="' . JHtml::tooltipText('COM_BANNERS_BATCH_CLIENT_LABEL', 'COM_BANNERS_BATCH_CLIENT_LABEL_DESC') . '">',
+			'<label id="batch-client-lbl" for="batch-client" class="hasTooltip" title="'
+				. JHtml::tooltipText('COM_BANNERS_BATCH_CLIENT_LABEL', 'COM_BANNERS_BATCH_CLIENT_LABEL_DESC')
+				. '">',
 			JText::_('COM_BANNERS_BATCH_CLIENT_LABEL'),
 			'</label>',
 			'<select name="batch[client_id]" id="batch-client-id">',
diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php
index 54948fc3422d7..e5039c2999e12 100644
--- a/administrator/components/com_banners/models/banner.php
+++ b/administrator/components/com_banners/models/banner.php
@@ -12,9 +12,7 @@
 /**
  * Banner model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelBanner extends JModelAdmin
 {
diff --git a/administrator/components/com_banners/models/banners.php b/administrator/components/com_banners/models/banners.php
index 75b4809e76816..4633c880f9bdc 100644
--- a/administrator/components/com_banners/models/banners.php
+++ b/administrator/components/com_banners/models/banners.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of banner records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelBanners extends JModelList
 {
diff --git a/administrator/components/com_banners/models/client.php b/administrator/components/com_banners/models/client.php
index 69a46619a8594..cc97865cab594 100644
--- a/administrator/components/com_banners/models/client.php
+++ b/administrator/components/com_banners/models/client.php
@@ -12,9 +12,7 @@
 /**
  * Client model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelClient extends JModelAdmin
 {
diff --git a/administrator/components/com_banners/models/clients.php b/administrator/components/com_banners/models/clients.php
index 511b831ae57c5..e59354f415efd 100644
--- a/administrator/components/com_banners/models/clients.php
+++ b/administrator/components/com_banners/models/clients.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of banner records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelClients extends JModelList
 {
diff --git a/administrator/components/com_banners/models/download.php b/administrator/components/com_banners/models/download.php
index 81cb8038a6b4b..6ef59dd4b7bd7 100644
--- a/administrator/components/com_banners/models/download.php
+++ b/administrator/components/com_banners/models/download.php
@@ -12,9 +12,7 @@
 /**
  * Download model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.5
+ * @since  1.5
  */
 class BannersModelDownload extends JModelForm
 {
diff --git a/administrator/components/com_banners/models/fields/bannerclient.php b/administrator/components/com_banners/models/fields/bannerclient.php
index 8f0b257b99b05..45a8979ff2f9a 100644
--- a/administrator/components/com_banners/models/fields/bannerclient.php
+++ b/administrator/components/com_banners/models/fields/bannerclient.php
@@ -16,9 +16,7 @@
 /**
  * Bannerclient Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldBannerClient extends JFormFieldList
 {
diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php
index 1ac80289d9039..71c20ee0df7e8 100644
--- a/administrator/components/com_banners/models/fields/clicks.php
+++ b/administrator/components/com_banners/models/fields/clicks.php
@@ -12,9 +12,7 @@
 /**
  * Clicks Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldClicks extends JFormField
 {
diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php
index 908b888943a0c..37bf6ba9110e3 100644
--- a/administrator/components/com_banners/models/fields/impmade.php
+++ b/administrator/components/com_banners/models/fields/impmade.php
@@ -12,9 +12,7 @@
 /**
  * Clicks Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldImpMade extends JFormField
 {
diff --git a/administrator/components/com_banners/models/fields/imptotal.php b/administrator/components/com_banners/models/fields/imptotal.php
index 8f42f5c2fb2ac..0809509a53ce1 100644
--- a/administrator/components/com_banners/models/fields/imptotal.php
+++ b/administrator/components/com_banners/models/fields/imptotal.php
@@ -12,9 +12,7 @@
 /**
  * Impressions Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldImpTotal extends JFormField
 {
diff --git a/administrator/components/com_banners/models/tracks.php b/administrator/components/com_banners/models/tracks.php
index 13b58efc07758..188b0be213628 100644
--- a/administrator/components/com_banners/models/tracks.php
+++ b/administrator/components/com_banners/models/tracks.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of tracks.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelTracks extends JModelList
 {
diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php
index 4fb4efc57f7a4..53593139a3bfd 100644
--- a/administrator/components/com_banners/tables/banner.php
+++ b/administrator/components/com_banners/tables/banner.php
@@ -12,9 +12,7 @@
 /**
  * Banner table
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.5
+ * @since  1.5
  */
 class BannersTableBanner extends JTable
 {
diff --git a/administrator/components/com_banners/tables/client.php b/administrator/components/com_banners/tables/client.php
index 98a40692b2a5c..fb2a0efeefc7f 100644
--- a/administrator/components/com_banners/tables/client.php
+++ b/administrator/components/com_banners/tables/client.php
@@ -12,9 +12,7 @@
 /**
  * Client table
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersTableClient extends JTable
 {
diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php
index 1055ee7c95547..50c96fa687202 100644
--- a/administrator/components/com_banners/views/banner/view.html.php
+++ b/administrator/components/com_banners/views/banner/view.html.php
@@ -14,9 +14,7 @@
 /**
  * View to edit a banner.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.5
+ * @since  1.5
  */
 class BannersViewBanner extends JViewLegacy
 {
diff --git a/administrator/components/com_banners/views/banners/view.html.php b/administrator/components/com_banners/views/banners/view.html.php
index 27c31b604a83a..150e3b3882e3c 100644
--- a/administrator/components/com_banners/views/banners/view.html.php
+++ b/administrator/components/com_banners/views/banners/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of banners.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersViewBanners extends JViewLegacy
 {
@@ -129,7 +127,9 @@ protected function addToolbar()
 		}
 
 		// Add a batch button
-		if ($user->authorise('core.create', 'com_banners') && $user->authorise('core.edit', 'com_banners') && $user->authorise('core.edit.state', 'com_banners'))
+		if ($user->authorise('core.create', 'com_banners')
+			&& $user->authorise('core.edit', 'com_banners')
+			&& $user->authorise('core.edit.state', 'com_banners'))
 		{
 			JHtml::_('bootstrap.modal', 'collapseModal');
 			$title = JText::_('JTOOLBAR_BATCH');
diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php
index 542eb280d4a74..9778da3fa0729 100644
--- a/administrator/components/com_banners/views/client/view.html.php
+++ b/administrator/components/com_banners/views/client/view.html.php
@@ -14,9 +14,7 @@
 /**
  * View to edit a client.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.5
+ * @since  1.5
  */
 class BannersViewClient extends JViewLegacy
 {
@@ -73,7 +71,10 @@ protected function addToolbar()
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
 		$canDo		= $this->canDo;
 
-		JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'), 'bookmark banners-clients');
+		JToolbarHelper::title(
+			$isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'),
+			'bookmark banners-clients'
+		);
 
 		// If not checked out, can save the item.
 		if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create')))
diff --git a/administrator/components/com_banners/views/clients/view.html.php b/administrator/components/com_banners/views/clients/view.html.php
index 5c114f3a06a3b..5d7489e5721cc 100644
--- a/administrator/components/com_banners/views/clients/view.html.php
+++ b/administrator/components/com_banners/views/clients/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of clients.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersViewClients extends JViewLegacy
 {
diff --git a/administrator/components/com_banners/views/download/view.html.php b/administrator/components/com_banners/views/download/view.html.php
index 7a56a70746435..b041116b017bf 100644
--- a/administrator/components/com_banners/views/download/view.html.php
+++ b/administrator/components/com_banners/views/download/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for download a list of tracks.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersViewDownload extends JViewLegacy
 {
diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php
index 9eb2e8b0fcb35..7ac2377d32e61 100644
--- a/administrator/components/com_banners/views/tracks/view.html.php
+++ b/administrator/components/com_banners/views/tracks/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of tracks.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersViewTracks extends JViewLegacy
 {
@@ -105,7 +103,13 @@ protected function addToolbar()
 		JHtmlSidebar::addFilter(
 			JText::_('COM_BANNERS_SELECT_TYPE'),
 			'filter_type',
-			JHtml::_('select.options', array(JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'))
+			JHtml::_(
+				'select.options',
+				array(JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))),
+				'value',
+				'text',
+				$this->state->get('filter.type')
+			)
 		);
 	}
 
diff --git a/administrator/components/com_banners/views/tracks/view.raw.php b/administrator/components/com_banners/views/tracks/view.raw.php
index 742faeafa7256..e4510498b1c26 100644
--- a/administrator/components/com_banners/views/tracks/view.raw.php
+++ b/administrator/components/com_banners/views/tracks/view.raw.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of tracks.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersViewTracks extends JViewLegacy
 {
@@ -42,7 +40,12 @@ public function display($tpl = null)
 
 		$document = JFactory::getDocument();
 		$document->setMimeEncoding($mimetype);
-		JFactory::getApplication()->setHeader('Content-disposition', 'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"', true);
+		JFactory::getApplication()
+			->setHeader(
+				'Content-disposition',
+				'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"',
+				true
+			);
 		echo $content;
 	}
 }
diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php
index 96157d1d3e3df..bceeff07cb2ee 100644
--- a/administrator/components/com_cache/controller.php
+++ b/administrator/components/com_cache/controller.php
@@ -12,17 +12,18 @@
 /**
  * Cache Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cache
- * @since       1.6
+ * @since  1.6
  */
 class CacheController extends JControllerLegacy
 {
 	/**
-	 * @param   boolean      If true, the view output will be cached
-	 * @param   array        An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController  This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
@@ -63,6 +64,11 @@ public function display($cachable = false, $urlparams = false)
 		}
 	}
 
+	/**
+	 * Purge an array of cache groups.
+	 *
+	 * @return  void
+	 */
 	public function delete()
 	{
 		// Check for request forgeries
@@ -84,6 +90,11 @@ public function delete()
 		$this->setRedirect('index.php?option=com_cache&client=' . $model->getClient()->id);
 	}
 
+	/**
+	 * Purge the cache.
+	 *
+	 * @return  void
+	 */
 	public function purge()
 	{
 		// Check for request forgeries
diff --git a/administrator/components/com_cache/helpers/cache.php b/administrator/components/com_cache/helpers/cache.php
index 83f22b819ef1c..9c3d7c1223807 100644
--- a/administrator/components/com_cache/helpers/cache.php
+++ b/administrator/components/com_cache/helpers/cache.php
@@ -12,9 +12,7 @@
 /**
  * Cache component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cache
- * @since       1.6
+ * @since  1.6
  */
 class CacheHelper
 {
@@ -29,15 +27,17 @@ public static function getClientOptions()
 		$options   = array();
 		$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
 		$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+
 		return $options;
 	}
 
 	/**
 	 * Configure the Linkbar.
 	 *
-	 * @param   string  The name of the active view.
+	 * @param   string  $vName  The name of the active view.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public static function addSubmenu($vName)
diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php
index 1ac58d5349027..54f3f625c8ca4 100644
--- a/administrator/components/com_cache/models/cache.php
+++ b/administrator/components/com_cache/models/cache.php
@@ -12,9 +12,7 @@
 /**
  * Cache Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cache
- * @since       1.6
+ * @since  1.6
  */
 class CacheModelCache extends JModelList
 {
@@ -44,6 +42,11 @@ class CacheModelCache extends JModelList
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -95,6 +98,7 @@ public function getData()
 				$this->_data = array();
 			}
 		}
+
 		return $this->_data;
 	}
 
@@ -163,7 +167,9 @@ public function getPagination()
 	 * Clean out a cache group as named by param.
 	 * If no param is passed clean all cache groups.
 	 *
-	 * @param String $group
+	 * @param   string  $group  Cache group name.
+	 *
+	 * @return  void
 	 */
 	public function clean($group = '')
 	{
@@ -171,6 +177,13 @@ public function clean($group = '')
 		$cache->clean($group);
 	}
 
+	/**
+	 * Clean a list of cache groups.
+	 *
+	 * @param   array  $array  Array of cache group names.
+	 *
+	 * @return  void
+	 */
 	public function cleanlist($array)
 	{
 		foreach ($array as $group)
@@ -179,9 +192,15 @@ public function cleanlist($array)
 		}
 	}
 
+	/**
+	 * Purge the cache.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 */
 	public function purge()
 	{
 		$cache = JFactory::getCache('');
+
 		return $cache->gc();
 	}
 }
diff --git a/administrator/components/com_cache/views/cache/view.html.php b/administrator/components/com_cache/views/cache/view.html.php
index 7fcb3f468bab1..ecd664c555bc4 100644
--- a/administrator/components/com_cache/views/cache/view.html.php
+++ b/administrator/components/com_cache/views/cache/view.html.php
@@ -12,17 +12,25 @@
 /**
  * HTML View class for the Cache component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cache
- * @since       1.6
+ * @since  1.6
  */
 class CacheViewCache extends JViewLegacy
 {
 	protected $client;
+
 	protected $data;
+
 	protected $pagination;
+
 	protected $state;
 
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
 	public function display($tpl = null)
 	{
 		$this->data			= $this->get('Data');
@@ -34,6 +42,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -45,6 +54,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -52,10 +63,12 @@ protected function addToolbar()
 		JToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE'), 'lightning clear');
 		JToolbarHelper::custom('delete', 'delete.png', 'delete_f2.png', 'JTOOLBAR_DELETE', true);
 		JToolbarHelper::divider();
+
 		if (JFactory::getUser()->authorise('core.admin', 'com_cache'))
 		{
 			JToolbarHelper::preferences('com_cache');
 		}
+
 		JToolbarHelper::divider();
 		JToolbarHelper::help('JHELP_SITE_MAINTENANCE_CLEAR_CACHE');
 
diff --git a/administrator/components/com_cache/views/purge/view.html.php b/administrator/components/com_cache/views/purge/view.html.php
index 79b517871e5ac..ea876c0cd0dd6 100644
--- a/administrator/components/com_cache/views/purge/view.html.php
+++ b/administrator/components/com_cache/views/purge/view.html.php
@@ -12,12 +12,17 @@
 /**
  * HTML View class for the Cache component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cache
- * @since       1.6
+ * @since  1.6
  */
 class CacheViewPurge extends JViewLegacy
 {
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
 	public function display($tpl = null)
 	{
 		$this->addToolbar();
@@ -28,20 +33,22 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
 	{
-		//JHtmlSidebar::addEntry(JText::_('COM_CACHE_BACK_CACHE_MANAGER'), 'index.php?option=com_cache', false);
-
 		JToolbarHelper::title(JText::_('COM_CACHE_PURGE_EXPIRED_CACHE'), 'lightning purge');
 		JToolbarHelper::custom('purge', 'delete.png', 'delete_f2.png', 'COM_CACHE_PURGE_EXPIRED', false);
 		JToolbarHelper::divider();
+
 		if (JFactory::getUser()->authorise('core.admin', 'com_cache'))
 		{
 			JToolbarHelper::preferences('com_cache');
 			JToolbarHelper::divider();
 		}
+
 		JToolbarHelper::help('JHELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE');
 	}
 }
diff --git a/administrator/components/com_categories/categories.php b/administrator/components/com_categories/categories.php
index fe340ffe51839..e08d6b3340368 100644
--- a/administrator/components/com_categories/categories.php
+++ b/administrator/components/com_categories/categories.php
@@ -12,7 +12,7 @@
 
 $input = JFactory::getApplication()->input;
 
-//If you have a url like this: com_categories&view=categories&extension=com_example.example_cat
+// If you have a url like this: com_categories&view=categories&extension=com_example.example_cat
 $parts = explode('.', $input->get('extension'));
 $component = $parts[0];
 
diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php
index 2be8b456876a4..4134879fbe7b0 100644
--- a/administrator/components/com_categories/controller.php
+++ b/administrator/components/com_categories/controller.php
@@ -12,9 +12,7 @@
 /**
  * Categories view class for the Category package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesController extends JControllerLegacy
 {
diff --git a/administrator/components/com_categories/controllers/categories.php b/administrator/components/com_categories/controllers/categories.php
index 35e3377cc4a0f..06b58c45c2146 100644
--- a/administrator/components/com_categories/controllers/categories.php
+++ b/administrator/components/com_categories/controllers/categories.php
@@ -12,9 +12,7 @@
 /**
  * The Categories List Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesControllerCategories extends JControllerAdmin
 {
diff --git a/administrator/components/com_categories/controllers/category.php b/administrator/components/com_categories/controllers/category.php
index f1c05722eaffa..071bba6edc563 100644
--- a/administrator/components/com_categories/controllers/category.php
+++ b/administrator/components/com_categories/controllers/category.php
@@ -12,9 +12,7 @@
 /**
  * The Category Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesControllerCategory extends JControllerForm
 {
@@ -29,7 +27,7 @@ class CategoriesControllerCategory extends JControllerForm
 	/**
 	 * Constructor.
 	 *
-	 * @param  array   $config  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
 	 * @since  1.6
 	 * @see    JController
diff --git a/administrator/components/com_categories/helpers/association.php b/administrator/components/com_categories/helpers/association.php
index fb833dfdff753..cb418ecb9fbf4 100644
--- a/administrator/components/com_categories/helpers/association.php
+++ b/administrator/components/com_categories/helpers/association.php
@@ -14,9 +14,7 @@
 /**
  * Category Component Association Helper
  *
- * @package     Joomla.Site
- * @subpackage  com_categories
- * @since       3.0
+ * @since  3.0
  */
 abstract class CategoryHelperAssociation
 {
diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php
index 743b40489f336..99d6572c7715e 100644
--- a/administrator/components/com_categories/helpers/categories.php
+++ b/administrator/components/com_categories/helpers/categories.php
@@ -12,9 +12,7 @@
 /**
  * Categories helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesHelper
 {
@@ -93,6 +91,14 @@ public static function getActions($extension, $categoryId = 0)
 		return $result;
 	}
 
+	/**
+	 * Gets a list of associations for a given item.
+	 *
+	 * @param   integer  $pk         Content item key.
+	 * @param   string   $extension  Optional extension name.
+	 *
+	 * @return  array of associations. 
+	 */
 	public static function getAssociations($pk, $extension = 'com_content')
 	{
 		$associations = array();
diff --git a/administrator/components/com_categories/helpers/html/categoriesadministrator.php b/administrator/components/com_categories/helpers/html/categoriesadministrator.php
index 1ee5b344b5565..8683b4dffbc40 100644
--- a/administrator/components/com_categories/helpers/html/categoriesadministrator.php
+++ b/administrator/components/com_categories/helpers/html/categoriesadministrator.php
@@ -14,10 +14,7 @@
 /**
  * Administrator category HTML
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- *
- * @since       3.2
+ * @since  3.2
  */
 abstract class JHtmlCategoriesAdministrator
 {
@@ -76,7 +73,16 @@ public static function association($catid, $extension = 'com_content')
 						$item->title
 					);
 
-					$item->link = JHtml::_('tooltip', implode(' ', $tooltipParts), null, null, $text, $url, null, 'hasTooltip label label-association label-' . $item->lang_sef);
+					$item->link = JHtml::_(
+						'tooltip',
+						implode(' ', $tooltipParts),
+						null,
+						null,
+						$text,
+						$url,
+						null,
+						'hasTooltip label label-association label-' . $item->lang_sef
+					);
 				}
 			}
 
diff --git a/administrator/components/com_categories/models/categories.php b/administrator/components/com_categories/models/categories.php
index 950e481abb133..2e951eaad8279 100644
--- a/administrator/components/com_categories/models/categories.php
+++ b/administrator/components/com_categories/models/categories.php
@@ -12,9 +12,7 @@
 /**
  * Categories Component Categories Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesModelCategories extends JModelList
 {
@@ -136,7 +134,9 @@ protected function getStoreId($id = '')
 	}
 
 	/**
-	 * @return  string
+	 * Method to get a database query to list categories.
+	 *
+	 * @return  JDatabaseQuery object.
 	 *
 	 * @since   1.6
 	 */
@@ -177,6 +177,7 @@ protected function getListQuery()
 
 		// Join over the associations.
 		$assoc = $this->getAssoc();
+
 		if ($assoc)
 		{
 			$query->select('COUNT(asso2.id)>1 as association')
@@ -212,6 +213,7 @@ protected function getListQuery()
 
 		// Filter by published state
 		$published = $this->getState('filter.published');
+
 		if (is_numeric($published))
 		{
 			$query->where('a.published = ' . (int) $published);
@@ -223,6 +225,7 @@ protected function getListQuery()
 
 		// Filter by search in title
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -249,6 +252,7 @@ protected function getListQuery()
 
 		// Filter by a single tag.
 		$tagId = $this->getState('filter.tag');
+
 		if (is_numeric($tagId))
 		{
 			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId)
@@ -262,6 +266,7 @@ protected function getListQuery()
 		// Add the list ordering clause
 		$listOrdering = $this->getState('list.ordering', 'a.lft');
 		$listDirn = $db->escape($this->getState('list.direction', 'ASC'));
+
 		if ($listOrdering == 'a.access')
 		{
 			$query->order('a.access ' . $listDirn . ', a.lft ' . $listDirn);
@@ -271,7 +276,6 @@ protected function getListQuery()
 			$query->order($db->escape($listOrdering) . ' ' . $listDirn);
 		}
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 
diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php
index 0ec1faeb4175b..5711f1940b812 100644
--- a/administrator/components/com_categories/models/category.php
+++ b/administrator/components/com_categories/models/category.php
@@ -12,9 +12,7 @@
 /**
  * Categories Component Category Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesModelCategory extends JModelAdmin
 {
@@ -50,7 +48,7 @@ public function __construct($config = array())
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
-	 * @param   object   $record  A record object.
+	 * @param   object  $record  A record object.
 	 *
 	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
 	 *
@@ -64,6 +62,7 @@ protected function canDelete($record)
 			{
 				return;
 			}
+
 			$user = JFactory::getUser();
 
 			return $user->authorise('core.delete', $record->extension . '.category.' . (int) $record->id);
@@ -73,7 +72,7 @@ protected function canDelete($record)
 	/**
 	 * Method to test whether a record can have its state changed.
 	 *
-	 * @param   object   $record  A record object.
+	 * @param   object  $record  A record object.
 	 *
 	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
 	 *
@@ -164,7 +163,6 @@ public function getItem($pk = null)
 	{
 		if ($result = parent::getItem($pk))
 		{
-
 			// Prime required properties.
 			if (empty($result->id))
 			{
@@ -210,6 +208,7 @@ public function getItem($pk = null)
 		}
 
 		$assoc = $this->getAssoc();
+
 		if ($assoc)
 		{
 			if ($result->id != null)
@@ -254,6 +253,7 @@ public function getForm($data = array(), $loadData = true)
 
 		// Get the form.
 		$form = $this->loadForm('com_categories.category' . $extension, 'category', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -264,7 +264,9 @@ public function getForm($data = array(), $loadData = true)
 		{
 			$data['extension'] = $extension;
 		}
+
 		$user = JFactory::getUser();
+
 		if (!$user->authorise('core.edit.state', $extension . '.category.' . $jinput->get('id')))
 		{
 			// Disable fields for display.
@@ -373,13 +375,17 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 
 			if (class_exists($cName) && is_callable(array($cName, 'onPrepareForm')))
 			{
-				$lang->load($component, JPATH_BASE, null, false, false) || $lang->load($component, JPATH_BASE . '/components/' . $component, null, false, false) || $lang->load($component, JPATH_BASE, $lang->getDefault(), false, false) || $lang->load($component, JPATH_BASE . '/components/' . $component, $lang->getDefault(), false, false);
+				$lang->load($component, JPATH_BASE, null, false, false)
+					|| $lang->load($component, JPATH_BASE . '/components/' . $component, null, false, false)
+					|| $lang->load($component, JPATH_BASE, $lang->getDefault(), false, false)
+					|| $lang->load($component, JPATH_BASE . '/components/' . $component, $lang->getDefault(), false, false);
 				call_user_func_array(array($cName, 'onPrepareForm'), array(&$form));
 
 				// Check for an error.
 				if ($form instanceof Exception)
 				{
 					$this->setError($form->getMessage());
+
 					return false;
 				}
 			}
@@ -391,6 +397,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 
 		// Association category items
 		$assoc = $this->getAssoc();
+
 		if ($assoc)
 		{
 			$languages = JLanguageHelper::getLanguages('lang_code');
@@ -401,6 +408,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 			$fieldset->addAttribute('name', 'item_associations');
 			$fieldset->addAttribute('description', 'COM_CATEGORIES_ITEM_ASSOCIATIONS_FIELDSET_DESC');
 			$add = false;
+
 			foreach ($languages as $tag => $language)
 			{
 				if (empty($data->language) || $tag != $data->language)
@@ -417,6 +425,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 					$field->addAttribute('clear', 'true');
 				}
 			}
+
 			if ($add)
 			{
 				$form->load($addform, false);
@@ -430,7 +439,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 	/**
 	 * Method to save the form data.
 	 *
-	 * @param   array    $data  The form data.
+	 * @param   array  $data  The form data.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -478,6 +487,7 @@ public function save($data)
 		if (!$table->bind($data))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -492,14 +502,17 @@ public function save($data)
 		if (!$table->check())
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
 		// Trigger the onContentBeforeSave event.
 		$result = $dispatcher->trigger($this->event_before_save, array($this->option . '.' . $this->name, &$table, $isNew));
+
 		if (in_array(false, $result, true))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -507,13 +520,14 @@ public function save($data)
 		if (!$table->store())
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
 		$assoc = $this->getAssoc();
+
 		if ($assoc)
 		{
-
 			// Adding self to the association
 			$associations = $data['associations'];
 
@@ -547,6 +561,7 @@ public function save($data)
 			if ($error = $db->getErrorMsg())
 			{
 				$this->setError($error);
+
 				return false;
 			}
 
@@ -568,6 +583,7 @@ public function save($data)
 				if ($error = $db->getErrorMsg())
 				{
 					$this->setError($error);
+
 					return false;
 				}
 			}
@@ -580,6 +596,7 @@ public function save($data)
 		if (!$table->rebuildPath($table->id))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -587,6 +604,7 @@ public function save($data)
 		if (!$table->rebuild($table->id, $table->lft, $table->level, $table->path))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -640,6 +658,7 @@ public function rebuild()
 		if (!$table->rebuild())
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -669,6 +688,7 @@ public function saveorder($idArray = null, $lft_array = null)
 		if (!$table->saveorder($idArray, $lft_array))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -678,6 +698,15 @@ public function saveorder($idArray = null, $lft_array = null)
 		return true;
 	}
 
+	/**
+	 * Batch tag a list of categories.
+	 *
+	 * @param   integer  $value     The value of the new tag.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean true if successful; false otherwise.
+	 */
 	protected function batchTag($value, $pks, $contexts)
 	{
 		// Set the variables
@@ -752,6 +781,7 @@ protected function batchCopy($value, $pks, $contexts)
 				{
 					// Fatal error
 					$this->setError($error);
+
 					return false;
 				}
 				else
@@ -761,8 +791,16 @@ protected function batchCopy($value, $pks, $contexts)
 					$parentId = 0;
 				}
 			}
+
 			// Check that user has create permission for parent category
-			$canCreate = ($parentId == $this->table->getRootId()) ? $this->user->authorise('core.create', $extension) : $this->user->authorise('core.create', $extension . '.category.' . $parentId);
+			if ($parentId == $this->table->getRootId())
+			{
+				$canCreate = $this->user->authorise('core.create', $extension);
+			}
+			else
+			{
+				$canCreate = $this->user->authorise('core.create', $extension . '.category.' . $parentId);
+			}
 
 			if (!$canCreate)
 			{
@@ -779,12 +817,14 @@ protected function batchCopy($value, $pks, $contexts)
 			if (!$parentId = $this->table->getRootId())
 			{
 				$this->setError($db->getErrorMsg());
+
 				return false;
 			}
 			// Make sure we can create in root
 			elseif (!$this->user->authorise('core.create', $extension))
 			{
 				$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
+
 				return false;
 			}
 		}
@@ -824,6 +864,7 @@ protected function batchCopy($value, $pks, $contexts)
 				{
 					// Fatal error
 					$this->setError($error);
+
 					return false;
 				}
 				else
@@ -884,6 +925,7 @@ protected function batchCopy($value, $pks, $contexts)
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
+
 				return false;
 			}
 
@@ -903,6 +945,7 @@ protected function batchCopy($value, $pks, $contexts)
 		if (!$this->table->rebuild())
 		{
 			$this->setError($this->table->getError());
+
 			return false;
 		}
 
@@ -910,6 +953,7 @@ protected function batchCopy($value, $pks, $contexts)
 		if (!$this->table->rebuildPath($this->table->id))
 		{
 			$this->setError($this->table->getError());
+
 			return false;
 		}
 
@@ -944,26 +988,34 @@ protected function batchMove($value, $pks, $contexts)
 			{
 				if ($error = $this->table->getError())
 				{
-					// Fatal error
+					// Fatal error.
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// Non-fatal error
+					// Non-fatal error.
 					$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
 					$parentId = 0;
 				}
 			}
 
-			// Check that user has create permission for parent category
-			$canCreate = ($parentId == $this->table->getRootId()) ? $this->user->authorise('core.create', $extension) : $this->user->authorise('core.create', $extension . '.category.' . $parentId);
+			// Check that user has create permission for parent category.
+			if ($parentId == $this->table->getRootId())
+			{
+				$canCreate = $this->user->authorise('core.create', $extension);
+			}
+			else
+			{
+				$canCreate = $this->user->authorise('core.create', $extension . '.category.' . $parentId);
+			}
 
 			if (!$canCreate)
 			{
 				// Error since user cannot create in parent category
 				$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
+
 				return false;
 			}
 
@@ -975,6 +1027,7 @@ protected function batchMove($value, $pks, $contexts)
 				{
 					// Error since user cannot edit this category
 					$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_EDIT'));
+
 					return false;
 				}
 			}
@@ -993,6 +1046,7 @@ protected function batchMove($value, $pks, $contexts)
 				{
 					// Fatal error
 					$this->setError($error);
+
 					return false;
 				}
 				else
@@ -1023,6 +1077,7 @@ protected function batchMove($value, $pks, $contexts)
 				catch (RuntimeException $e)
 				{
 					$this->setError($e->getMessage());
+
 					return false;
 				}
 			}
@@ -1033,6 +1088,7 @@ protected function batchMove($value, $pks, $contexts)
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
+
 				return false;
 			}
 
@@ -1040,6 +1096,7 @@ protected function batchMove($value, $pks, $contexts)
 			if (!$this->table->rebuildPath())
 			{
 				$this->setError($this->table->getError());
+
 				return false;
 			}
 		}
@@ -1058,11 +1115,17 @@ protected function batchMove($value, $pks, $contexts)
 	/**
 	 * Custom clean the cache of com_content and content modules
 	 *
+	 * @param   string   $group      Cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function cleanCache($group = null, $client_id = 0)
 	{
 		$extension = JFactory::getApplication()->input->get('extension');
+
 		switch ($extension)
 		{
 			case 'com_content':
@@ -1095,6 +1158,7 @@ protected function generateNewTitle($parent_id, $alias, $title)
 	{
 		// Alter the title & alias
 		$table = $this->getTable();
+
 		while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id)))
 		{
 			$title = JString::increment($title);
@@ -1104,6 +1168,11 @@ protected function generateNewTitle($parent_id, $alias, $title)
 		return array($title, $alias);
 	}
 
+	/**
+	 * Method to determine if a category association is available.
+	 * 
+	 * @return  boolean True if a category association is available; false otherwise.
+	 */
 	public function getAssoc()
 	{
 		static $assoc = null;
diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php
index 36528f391895f..e06ba8cab86de 100644
--- a/administrator/components/com_categories/models/fields/categoryedit.php
+++ b/administrator/components/com_categories/models/fields/categoryedit.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldCategoryEdit extends JFormFieldList
 {
@@ -45,6 +43,7 @@ protected function getOptions()
 
 		// Let's get the id for the current item, either category or content item.
 		$jinput = JFactory::getApplication()->input;
+
 		// Load the category options for a given extension.
 
 		// For categories the old category is the category id or 0 for new category.
@@ -95,7 +94,6 @@ protected function getOptions()
 		// Filter language
 		if (!empty($this->element['language']))
 		{
-
 			$query->where('a.language = ' . $db->quote($this->element['language']));
 		}
 
@@ -137,6 +135,7 @@ protected function getOptions()
 					$options[$i]->text = JText::_('JGLOBAL_ROOT_PARENT');
 				}
 			}
+
 			if ($options[$i]->published == 1)
 			{
 				$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->text;
@@ -155,9 +154,10 @@ 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.
-				// Unset the option if the user isn't authorised for it. In this field assets are always categories.
+				/* 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)
 				{
 					unset($options[$i]);
@@ -167,9 +167,10 @@ 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
-			// 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.
+			/* 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.
+			 */
 			foreach ($options as $i => $option)
 			{
 				if ($user->authorise('core.edit.state', $extension . '.category.' . $oldCat) != true && !isset($oldParent))
@@ -179,10 +180,10 @@ protected function getOptions()
 						unset($options[$i]);
 					}
 				}
+
 				if ($user->authorise('core.edit.state', $extension . '.category.' . $oldCat) != true
 					&& (isset($oldParent))
-					&& $option->value != $oldParent
-				)
+					&& $option->value != $oldParent)
 				{
 					unset($options[$i]);
 				}
@@ -190,17 +191,16 @@ protected function getOptions()
 				// 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))
-				)
+					&& ($option->value != $oldCat && !isset($oldParent)))
 				{
 					{
 						unset($options[$i]);
 					}
 				}
+
 				if (($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
 					&& (isset($oldParent))
-					&& $option->value != $oldParent
-				)
+					&& $option->value != $oldParent)
 				{
 					{
 						unset($options[$i]);
@@ -208,10 +208,10 @@ protected function getOptions()
 				}
 			}
 		}
+
 		if (($this->element['parent'] == true || $jinput->get('option') == 'com_categories')
 			&& (isset($row) && !isset($options[0]))
-			&& isset($this->element['show_root'])
-		)
+			&& isset($this->element['show_root']))
 		{
 			if ($row->parent_id == '1')
 			{
@@ -219,6 +219,7 @@ protected function getOptions()
 				$parent->text = JText::_('JGLOBAL_ROOT_PARENT');
 				array_unshift($options, $parent);
 			}
+
 			array_unshift($options, JHtml::_('select.option', '0', JText::_('JGLOBAL_ROOT')));
 		}
 
diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php
index a54e2af3a8070..35490066610ee 100644
--- a/administrator/components/com_categories/models/fields/categoryparent.php
+++ b/administrator/components/com_categories/models/fields/categoryparent.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldCategoryParent extends JFormFieldList
 {
@@ -43,6 +41,7 @@ protected function getOptions()
 
 		// Let's get the id for the current item, either category or content item.
 		$jinput = JFactory::getApplication()->input;
+
 		// For categories the old category is the category id 0 for new category.
 		if ($this->element['parent'])
 		{
@@ -65,6 +64,7 @@ protected function getOptions()
 		{
 			$query->where('(a.extension = ' . $db->quote($extension) . ' OR a.parent_id = 0)');
 		}
+
 		if ($this->element['parent'])
 		{
 			// Prevent parenting to children of this item.
@@ -81,6 +81,7 @@ protected function getOptions()
 				$row = $db->loadObject();
 			}
 		}
+
 		$query->where('a.published IN (0,1)')
 			->group('a.id, a.title, a.level, a.lft, a.rgt, a.extension, a.parent_id')
 			->order('a.lft ASC');
@@ -117,9 +118,10 @@ 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.
-				// Unset the option if the user isn't authorised for it. In this field assets are always categories.
+				/* 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)
 				{
 					unset($options[$i]);
@@ -129,12 +131,12 @@ protected function getOptions()
 		// If you have an existing category id things are more complex.
 		else
 		{
-			//$categoryOld = $this->form->getValue($name);
 			foreach ($options as $i => $option)
 			{
-				// 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.
+				/* 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.
+				 */
 				if ($user->authorise('core.edit.state', $extension . '.category.' . $oldCat) != true)
 				{
 					if ($option->value != $oldCat)
@@ -145,8 +147,7 @@ protected function getOptions()
 				}
 				// 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)
+				elseif (($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
 					&& $option->value != $oldCat
 				)
 				{
diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php
index 3b6ec19a98466..6ac1d02c46622 100644
--- a/administrator/components/com_categories/models/fields/modal/category.php
+++ b/administrator/components/com_categories/models/fields/modal/category.php
@@ -12,9 +12,7 @@
 /**
  * Supports a modal article picker.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       3.1
+ * @since  3.1
  */
 class JFormFieldModal_Category extends JFormField
 {
@@ -30,11 +28,19 @@ class JFormFieldModal_Category extends JFormField
 	 * Method to get the field input markup.
 	 *
 	 * @return  string	The field input markup.
+	 *
 	 * @since   1.6
 	 */
 	protected function getInput()
 	{
-		$extension 		= $this->element['extension'] ? (string) $this->element['extension'] : (string) JFactory::getApplication()->input->get('extension', 'com_content');
+		if ($this->element['extension'])
+		{
+			$extension = (string) $this->element['extension'];
+		}
+		else
+		{
+			$extension = (string) JFactory::getApplication()->input->get('extension', 'com_content');
+		}
 
 		$allowEdit		= ((string) $this->element['edit'] == 'true') ? true : false;
 		$allowClear		= ((string) $this->element['clear'] != 'false') ? true : false;
@@ -75,7 +81,8 @@ protected function getInput()
 
 			$script[] = '	function jClearCategory(id) {';
 			$script[] = '		document.getElementById(id + "_id").value = "";';
-			$script[] = '		document.getElementById(id + "_name").value = "' . htmlspecialchars(JText::_('COM_CATEGORIES_SELECT_A_CATEGORY', true), ENT_COMPAT, 'UTF-8') . '";';
+			$script[] = '		document.getElementById(id + "_name").value = "'
+				. htmlspecialchars(JText::_('COM_CATEGORIES_SELECT_A_CATEGORY', true), ENT_COMPAT, 'UTF-8') . '";';
 			$script[] = '		jQuery("#"+id + "_clear").addClass("hidden");';
 			$script[] = '		if (document.getElementById(id + "_edit")) {';
 			$script[] = '			jQuery("#"+id + "_edit").addClass("hidden");';
@@ -89,7 +96,8 @@ protected function getInput()
 
 		// Setup variables for display.
 		$html = array();
-		$link = 'index.php?option=com_categories&amp;view=categories&amp;layout=modal&amp;tmpl=component&amp;extension=' . $extension . '&amp;function=jSelectCategory_' . $this->id;
+		$link = 'index.php?option=com_categories&amp;view=categories&amp;layout=modal&amp;tmpl=component&amp;extension='
+			. $extension . '&amp;function=jSelectCategory_' . $this->id;
 
 		if (isset($this->element['language']))
 		{
@@ -119,6 +127,7 @@ protected function getInput()
 		{
 			$title = JText::_('COM_CATEGORIES_SELECT_A_CATEGORY');
 		}
+
 		$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
 
 		// The active category id field.
@@ -134,24 +143,42 @@ protected function getInput()
 		// The current category display field.
 		$html[] = '<span class="input-append">';
 		$html[] = '<input type="text" class="input-medium" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
-		$html[] = '<a class="modal btn hasTooltip" title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> ' . JText::_('JSELECT') . '</a>';
+		$html[] = '<a'
+			. ' class="modal btn hasTooltip"'
+			. ' title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '"'
+			. ' href="' . $link . '&amp;' . JSession::getFormToken() . '=1"'
+			. ' rel="{handler: \'iframe\', size: {x: 800, y: 450}}">'
+			. '<i class="icon-file"></i> ' . JText::_('JSELECT')
+			. '</a>';
 
 		// Edit category button
 		if ($allowEdit)
 		{
-			$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_categories&layout=modal&tmpl=component&task=category.edit&id=' . $value . '" target="_blank" title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
+			$html[] = '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' href="index.php?option=com_categories&layout=modal&tmpl=component&task=category.edit&id=' . $value . '"'
+				. ' target="_blank"'
+				. ' title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '" >'
+				. '<span class="icon-edit"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
 		}
 
 		// Clear category button
 		if ($allowClear)
 		{
-			$html[] = '<button id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearCategory(\'' . $this->id . '\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
+			$html[] = '<button'
+				. ' id="' . $this->id . '_clear"'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' onclick="return jClearCategory(\'' . $this->id . '\')">'
+				. '<span class="icon-remove"></span> ' . JText::_('JCLEAR')
+				. '</button>';
 		}
 
 		$html[] = '</span>';
 
-		// class='required' for client side validation
+		// Note: class='required' for client side validation
 		$class = '';
+
 		if ($this->required)
 		{
 			$class = ' class="required modal-value"';
diff --git a/administrator/components/com_categories/tables/category.php b/administrator/components/com_categories/tables/category.php
index b6b168e1a1f89..8733f0c1d2326 100644
--- a/administrator/components/com_categories/tables/category.php
+++ b/administrator/components/com_categories/tables/category.php
@@ -12,9 +12,7 @@
 /**
  * Category table
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesTableCategory extends JTableCategory
 {
diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php
index 8060242933793..c0522083a4932 100644
--- a/administrator/components/com_categories/views/categories/tmpl/modal.php
+++ b/administrator/components/com_categories/views/categories/tmpl/modal.php
@@ -21,6 +21,7 @@
 // Include the component HTML helpers.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
 
 $extension	= $this->escape($this->state->get('filter.extension'));
 $function  	= $app->input->getCmd('function', 'jSelectCategory');
@@ -144,7 +145,7 @@
 						<?php endif; ?>
 					</td>
 					<td class="center hidden-phone">
-						<?php echo (int) $item->id; ?></span>
+						<?php echo (int) $item->id; ?>
 					</td>
 				</tr>
 			<?php endforeach; ?>
diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php
index 529780a3ebb35..83ddeff2618e1 100644
--- a/administrator/components/com_categories/views/categories/view.html.php
+++ b/administrator/components/com_categories/views/categories/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Categories view class for the Category package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesViewCategories extends JViewLegacy
 {
diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php
index f77ad3443103f..3c18aeda04fb9 100644
--- a/administrator/components/com_categories/views/category/view.html.php
+++ b/administrator/components/com_categories/views/category/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Categories component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_categories
- * @since       1.6
+ * @since  1.6
  */
 class CategoriesViewCategory extends JViewLegacy
 {
@@ -27,7 +25,11 @@ class CategoriesViewCategory extends JViewLegacy
 	protected $assoc;
 
 	/**
-	 * Display the view
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -44,6 +46,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -65,6 +68,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -124,7 +129,11 @@ protected function addToolbar()
 		JHtml::_('stylesheet', $component . '/administrator/categories.css', array(), true);
 
 		// Prepare the toolbar.
-		JToolbarHelper::title($title, 'folder category-' . ($isNew ? 'add' : 'edit') . ' ' . substr($component, 4) . ($section ? "-$section" : '') . '-category-' . ($isNew ? 'add' : 'edit'));
+		JToolbarHelper::title(
+			$title,
+			'folder category-' . ($isNew ? 'add' : 'edit')
+				. ' ' . substr($component, 4) . ($section ? "-$section" : '') . '-category-' . ($isNew ? 'add' : 'edit')
+		);
 
 		// For new records, check the create permission.
 		if ($isNew && (count($user->getAuthorisedCategories($component, 'core.create')) > 0))
@@ -139,6 +148,7 @@ protected function addToolbar()
 		{
 			JToolbarHelper::apply('category.apply');
 			JToolbarHelper::save('category.save');
+
 			if ($canDo->get('core.create'))
 			{
 				JToolbarHelper::save2new('category.save2new');
@@ -174,10 +184,11 @@ protected function addToolbar()
 			$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
-		// -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 ''
+		/* 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 ''
+		 */
 		if ($lang->hasKey($lang_help_url = strtoupper($component) . '_HELP_URL'))
 		{
 			$debug = $lang->setDebug(false);
@@ -188,6 +199,7 @@ protected function addToolbar()
 		{
 			$url = null;
 		}
+
 		JToolbarHelper::help($ref_key, $componentParams->exists('helpURL'), $url, $component);
 	}
 }
diff --git a/administrator/components/com_checkin/controller.php b/administrator/components/com_checkin/controller.php
index 072fa8764197f..9c7c0873d8861 100644
--- a/administrator/components/com_checkin/controller.php
+++ b/administrator/components/com_checkin/controller.php
@@ -12,12 +12,18 @@
 /**
  * Checkin Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_checkin
- * @since       1.6
+ * @since  1.6
  */
 class CheckinController extends JControllerLegacy
 {
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  A JControllerLegacy object to support chaining.
+	 */
 	public function display($cachable = false, $urlparams = false)
 	{
 		// Load the submenu.
@@ -28,6 +34,11 @@ public function display($cachable = false, $urlparams = false)
 		return $this;
 	}
 
+	/**
+	 * Check in a list of items.
+	 *
+	 * @return  void
+	 */
 	public function checkin()
 	{
 		// Check for request forgeries
diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php
index 200487faf6427..37a3f5f1b496e 100644
--- a/administrator/components/com_checkin/models/checkin.php
+++ b/administrator/components/com_checkin/models/checkin.php
@@ -12,9 +12,7 @@
 /**
  * Checkin Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_checkin
- * @since       1.6
+ * @since  1.6
  */
 class CheckinModelCheckin extends JModelList
 {
@@ -25,7 +23,8 @@ class CheckinModelCheckin extends JModelList
 	/**
 	 * Method to auto-populate the model state.
 	 *
-	 * @Note. Calling getState in this method will result in recursion.
+	 * Note: Calling getState in this method will result in recursion.
+	 *
 	 * @param   string  $ordering   An optional ordering field.
 	 * @param   string  $direction  An optional direction (asc|desc).
 	 *
@@ -45,7 +44,7 @@ protected function populateState($ordering = null, $direction = null)
 	/**
 	 * Checks in requested tables
 	 *
-	 * @param   array    $ids  An array of table names. Optional.
+	 * @param   array  $ids  An array of table names. Optional.
 	 *
 	 * @return  integer  Checked in item count
 	 *
@@ -62,12 +61,12 @@ public function checkin($ids = array())
 			return;
 		}
 
-		// this int will hold the checked item count
+		// This int will hold the checked item count.
 		$results = 0;
 
 		foreach ($ids as $tn)
 		{
-			// make sure we get the right tables based on prefix
+			// Make sure we get the right tables based on prefix.
 			if (stripos($tn, $app->get('dbprefix')) !== 0)
 			{
 				continue;
@@ -87,11 +86,13 @@ public function checkin($ids = array())
 				->where('checked_out > 0');
 
 			$db->setQuery($query);
+
 			if ($db->execute())
 			{
 				$results = $results + $db->getAffectedRows();
 			}
 		}
+
 		return $results;
 	}
 
@@ -108,13 +109,14 @@ public function getTotal()
 		{
 			$this->getItems();
 		}
+
 		return $this->total;
 	}
 
 	/**
 	 * Get tables
 	 *
-	 * @return  array  Checked in table names as keys and checked in item count as values
+	 * @return  array  Checked in table names as keys and checked in item count as values.
 	 *
 	 * @since   1.6
 	 */
@@ -126,12 +128,12 @@ public function getItems()
 			$db     = $this->_db;
 			$tables = $db->getTableList();
 
-			// this array will hold table name as key and checked in item count as value
+			// This array will hold table name as key and checked in item count as value.
 			$results = array();
 
 			foreach ($tables as $i => $tn)
 			{
-				// make sure we get the right tables based on prefix
+				// Make sure we get the right tables based on prefix.
 				if (stripos($tn, $app->get('dbprefix')) !== 0)
 				{
 					unset($tables[$i]);
diff --git a/administrator/components/com_checkin/views/checkin/view.html.php b/administrator/components/com_checkin/views/checkin/view.html.php
index 92866c09d4a27..b530af020bf3e 100644
--- a/administrator/components/com_checkin/views/checkin/view.html.php
+++ b/administrator/components/com_checkin/views/checkin/view.html.php
@@ -12,14 +12,19 @@
 /**
  * HTML View class for the Checkin component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_checkin
- * @since       1.0
+ * @since  1.0
  */
 class CheckinViewCheckin extends JViewLegacy
 {
 	protected $tables;
 
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
 	public function display($tpl = null)
 	{
 		$this->items		= $this->get('Items');
@@ -30,6 +35,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -41,11 +47,14 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
 	{
 		JToolbarHelper::title(JText::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin');
+
 		if (JFactory::getUser()->authorise('core.admin', 'com_checkin'))
 		{
 			JToolbarHelper::custom('checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
@@ -53,6 +62,7 @@ protected function addToolbar()
 			JToolbarHelper::preferences('com_checkin');
 			JToolbarHelper::divider();
 		}
+
 		JToolbarHelper::help('JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN');
 	}
 }
diff --git a/administrator/components/com_config/controller.php b/administrator/components/com_config/controller.php
index 2d6bdbc3e2a41..9183f3cc6acdb 100644
--- a/administrator/components/com_config/controller.php
+++ b/administrator/components/com_config/controller.php
@@ -12,9 +12,7 @@
 /**
  * Config Component Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       1.5
+ * @since  1.5
  */
 class ConfigController extends JControllerLegacy
 {
@@ -41,7 +39,11 @@ public function display($cachable = false, $urlparams = array())
 		// Set the default view name and format from the Request.
 		$vName = $this->input->get('view', 'application');
 
-		JLog::add('ConfigController is deprecated. Use ConfigControllerApplicationDisplay or ConfigControllerComponentDisplay instead.', JLog::WARNING, 'deprecated');
+		JLog::add(
+			'ConfigController is deprecated. Use ConfigControllerApplicationDisplay or ConfigControllerComponentDisplay instead.',
+			JLog::WARNING,
+			'deprecated'
+		);
 
 		if (ucfirst($vName) == 'Application')
 		{
diff --git a/administrator/components/com_config/controller/application/cancel.php b/administrator/components/com_config/controller/application/cancel.php
index 5a80c1801b940..dce035d0063bd 100644
--- a/administrator/components/com_config/controller/application/cancel.php
+++ b/administrator/components/com_config/controller/application/cancel.php
@@ -12,9 +12,7 @@
 /**
  * Cancel Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerApplicationCancel extends ConfigControllerCanceladmin
 {
diff --git a/administrator/components/com_config/controller/application/display.php b/administrator/components/com_config/controller/application/display.php
index 5cce21e15d9c3..68c7e602c6386 100644
--- a/administrator/components/com_config/controller/application/display.php
+++ b/administrator/components/com_config/controller/application/display.php
@@ -12,10 +12,8 @@
 /**
  * Base Display Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
- * @note        Needed for front end view
+ * @since  3.2
+ * @note   Needed for front end view
  */
 class ConfigControllerApplicationDisplay extends ConfigControllerDisplay
 {
diff --git a/administrator/components/com_config/controller/application/refreshhelp.php b/administrator/components/com_config/controller/application/refreshhelp.php
index 0063b03750080..e1ec55868298c 100644
--- a/administrator/components/com_config/controller/application/refreshhelp.php
+++ b/administrator/components/com_config/controller/application/refreshhelp.php
@@ -12,9 +12,7 @@
 /**
  * Refresh Help Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerApplicationRefreshhelp extends JControllerBase
 {
diff --git a/administrator/components/com_config/controller/application/removeroot.php b/administrator/components/com_config/controller/application/removeroot.php
index 66cb9b21d3b05..a390bfbd82679 100644
--- a/administrator/components/com_config/controller/application/removeroot.php
+++ b/administrator/components/com_config/controller/application/removeroot.php
@@ -11,9 +11,7 @@
 /**
  * Remove Root Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerApplicationRemoveroot extends JControllerBase
 {
diff --git a/administrator/components/com_config/controller/application/save.php b/administrator/components/com_config/controller/application/save.php
index 39bf2a7861fd0..001a14e79f76c 100644
--- a/administrator/components/com_config/controller/application/save.php
+++ b/administrator/components/com_config/controller/application/save.php
@@ -11,9 +11,7 @@
 /**
  * Save Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerApplicationSave extends JControllerBase
 {
diff --git a/administrator/components/com_config/controller/component/cancel.php b/administrator/components/com_config/controller/component/cancel.php
index f11c05a93f8f1..1d78d03c8d1ea 100644
--- a/administrator/components/com_config/controller/component/cancel.php
+++ b/administrator/components/com_config/controller/component/cancel.php
@@ -12,9 +12,7 @@
 /**
  * Cancel Controller for global configuration components
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerComponentCancel extends ConfigControllerCanceladmin
 {
diff --git a/administrator/components/com_config/controller/component/display.php b/administrator/components/com_config/controller/component/display.php
index 860ddfbbf43b7..eaef905e0c178 100644
--- a/administrator/components/com_config/controller/component/display.php
+++ b/administrator/components/com_config/controller/component/display.php
@@ -12,10 +12,8 @@
 /**
  * Base Display Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
- * @note        Needed for front end view
+ * @since  3.2
+ * @note   Needed for front end view
  */
 class ConfigControllerComponentDisplay extends ConfigControllerDisplay
 {
diff --git a/administrator/components/com_config/controller/component/save.php b/administrator/components/com_config/controller/component/save.php
index 82bc02678d1ab..085996d86d37a 100644
--- a/administrator/components/com_config/controller/component/save.php
+++ b/administrator/components/com_config/controller/component/save.php
@@ -12,9 +12,7 @@
 /**
  * Save Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerComponentSave extends JControllerBase
 {
diff --git a/administrator/components/com_config/controllers/application.php b/administrator/components/com_config/controllers/application.php
index c005e719dcd06..d1a08075c7bea 100644
--- a/administrator/components/com_config/controllers/application.php
+++ b/administrator/components/com_config/controllers/application.php
@@ -12,8 +12,6 @@
 /**
  * Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
  * @since       1.5
  * @deprecated  4.0
  */
@@ -53,7 +51,10 @@ public function save()
 	}
 
 	/**
-	 * Cancel operation
+	 * Cancel operation.
+	 *
+	 * @return  boolean  True if successful; false otherwise.
+	 *
 	 * @deprecated  4.0  Use ConfigControllerApplicationCancel instead.
 	 */
 	public function cancel()
@@ -65,6 +66,13 @@ public function cancel()
 		return $controller->execute();
 	}
 
+	/**
+	 * Method to refresh the help display.
+	 *
+	 * @return  void
+	 *
+	 * @deprecated  4,0  Use ConfigControllerApplicationRefreshhelp instead.
+	 */
 	public function refreshHelp()
 	{
 		JLog::add('ConfigControllerApplication is deprecated. Use ConfigControllerApplicationRefreshhelp instead.', JLog::WARNING, 'deprecated');
diff --git a/administrator/components/com_config/controllers/component.php b/administrator/components/com_config/controllers/component.php
index 3b2fea6fdc6ba..904954f763edb 100644
--- a/administrator/components/com_config/controllers/component.php
+++ b/administrator/components/com_config/controllers/component.php
@@ -12,8 +12,6 @@
 /**
  * Note: this view is intended only to be opened in a popup
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
  * @since       1.5
  * @deprecated  4.0
  */
@@ -43,7 +41,7 @@ public function __construct($config = array())
 	 * @since   3.0
 	 * @deprecated  4.0  Use ConfigControllerComponentCancel instead.
 	 */
-	function cancel()
+	public function cancel()
 	{
 		JLog::add('ConfigControllerComponent is deprecated. Use ConfigControllerComponentCancel instead.', JLog::WARNING, 'deprecated');
 
@@ -53,7 +51,10 @@ function cancel()
 	}
 
 	/**
-	 * Save the configuration
+	 * Save the configuration.
+	 *
+	 * @return  boolean  True if successful; false otherwise.
+	 *
 	 * @deprecated  4.0  Use ConfigControllerComponentSave instead.
 	 */
 	public function save()
diff --git a/administrator/components/com_config/helper/config.php b/administrator/components/com_config/helper/config.php
index 3a95a58a3a226..54c8096eb2b9f 100644
--- a/administrator/components/com_config/helper/config.php
+++ b/administrator/components/com_config/helper/config.php
@@ -12,9 +12,7 @@
 /**
  * Components helper for com_config
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.0
+ * @since  3.0
  */
 class ConfigHelperConfig extends JHelperContent
 {
@@ -54,10 +52,10 @@ public static function hasComponentConfig($component)
 	}
 
 	/**
-	 * Returns an array of all components with configuration options. By only
-	 * components for which the current user has 'core.manage' rights are returned.
+	 * Returns an array of all components with configuration options.
+	 * Optionally return only those components for which the current user has 'core.manage' rights.
 	 *
-	 * @param   boolean  $authCheck
+	 * @param   boolean  $authCheck  True to restrict to components where current user has 'core.manage' rights.
 	 *
 	 * @return  array
 	 *
@@ -86,7 +84,7 @@ public static function getComponentsWithConfig($authCheck = true)
 	/**
 	 * Load the sys language for the given component.
 	 *
-	 * @param   string  $components
+	 * @param   array  $components  Array of component names.
 	 *
 	 * @return  void
 	 *
diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php
index 03e510563547a..c05e12f2dadc7 100644
--- a/administrator/components/com_config/model/application.php
+++ b/administrator/components/com_config/model/application.php
@@ -12,9 +12,7 @@
 /**
  * Model for the global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigModelApplication extends ConfigModelForm
 {
@@ -199,8 +197,9 @@ public function save($data)
 			$data['caching'] = 0;
 		}
 
+		$path = JPATH_SITE . '/cache';
+
 		// Give a warning if the cache-folder can not be opened
-		$path = JPATH_SITE.'/cache';
 		if ($data['caching'] > 0 && $data['cache_handler'] == 'file' && @opendir($path) == false)
 		{
 			JLog::add(JText::sprintf('COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE', $path), JLog::WARNING, 'jerror');
diff --git a/administrator/components/com_config/model/component.php b/administrator/components/com_config/model/component.php
index f3f8046cab706..bf5835a1fa83d 100644
--- a/administrator/components/com_config/model/component.php
+++ b/administrator/components/com_config/model/component.php
@@ -12,9 +12,7 @@
 /**
  * Model for component configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigModelComponent extends ConfigModelForm
 {
@@ -83,7 +81,6 @@ public function getForm($data = array(), $loadData = true)
 
 		if (empty($form))
 		{
-
 			return false;
 		}
 
diff --git a/administrator/components/com_config/model/field/filters.php b/administrator/components/com_config/model/field/filters.php
index 210f4d553aade..468bdb78d8d07 100644
--- a/administrator/components/com_config/model/field/filters.php
+++ b/administrator/components/com_config/model/field/filters.php
@@ -12,9 +12,7 @@
 /**
  * Text Filters form field.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldFilters extends JFormField
 {
@@ -59,7 +57,8 @@ protected function getInput()
 		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '">' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
-		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '">' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
+		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '">'
+			. JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '	</tr>';
 		$html[] = '	</thead>';
@@ -85,18 +84,33 @@ protected function getInput()
 			$html[] = '		</th>';
 			$html[] = '		<td>';
 			$html[] = '				<select name="' . $this->name . '[' . $group->value . '][filter_type]" id="' . $this->id . $group->value . '_filter_type">';
-			$html[] = '					<option value="BL"' . ($group_filter['filter_type'] == 'BL' ? ' selected="selected"' : '') . '>' . JText::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST') . '</option>';
-			$html[] = '					<option value="CBL"' . ($group_filter['filter_type'] == 'CBL' ? ' selected="selected"' : '') . '>' . JText::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST') . '</option>';
-			$html[] = '					<option value="WL"' . ($group_filter['filter_type'] == 'WL' ? ' selected="selected"' : '') . '>' . JText::_('COM_CONFIG_FIELD_FILTERS_WHITE_LIST') . '</option>';
-			$html[] = '					<option value="NH"' . ($group_filter['filter_type'] == 'NH' ? ' selected="selected"' : '') . '>' . JText::_('COM_CONFIG_FIELD_FILTERS_NO_HTML') . '</option>';
-			$html[] = '					<option value="NONE"' . ($group_filter['filter_type'] == 'NONE' ? ' selected="selected"' : '') . '>' . JText::_('COM_CONFIG_FIELD_FILTERS_NO_FILTER') . '</option>';
+			$html[] = '					<option value="BL"' . ($group_filter['filter_type'] == 'BL' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST') . '</option>';
+			$html[] = '					<option value="CBL"' . ($group_filter['filter_type'] == 'CBL' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST') . '</option>';
+			$html[] = '					<option value="WL"' . ($group_filter['filter_type'] == 'WL' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_WHITE_LIST') . '</option>';
+			$html[] = '					<option value="NH"' . ($group_filter['filter_type'] == 'NH' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_NO_HTML') . '</option>';
+			$html[] = '					<option value="NONE"' . ($group_filter['filter_type'] == 'NONE' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_NO_FILTER') . '</option>';
 			$html[] = '				</select>';
 			$html[] = '		</td>';
 			$html[] = '		<td>';
-			$html[] = '				<input name="' . $this->name . '[' . $group->value . '][filter_tags]" id="' . $this->id . $group->value . '_filter_tags" title="' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '" value="' . $group_filter['filter_tags'] . '"/>';
+			$html[] = '				<input'
+				. ' name="' . $this->name . '[' . $group->value . '][filter_tags]"'
+				. ' id="' . $this->id . $group->value . '_filter_tags"'
+				. ' title="' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '"'
+				. ' value="' . $group_filter['filter_tags'] . '"'
+				. '/>';
 			$html[] = '		</td>';
 			$html[] = '		<td>';
-			$html[] = '				<input name="' . $this->name . '[' . $group->value . '][filter_attributes]" id="' . $this->id . $group->value . '_filter_attributes" title="' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '" value="' . $group_filter['filter_attributes'] . '"/>';
+			$html[] = '				<input'
+				. ' name="' . $this->name . '[' . $group->value . '][filter_attributes]"'
+				. ' id="' . $this->id . $group->value . '_filter_attributes"'
+				. ' title="' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '"'
+				. ' value="' . $group_filter['filter_attributes'] . '"'
+				. '/>';
 			$html[] = '		</td>';
 			$html[] = '	</tr>';
 		}
diff --git a/administrator/components/com_config/view/application/html.php b/administrator/components/com_config/view/application/html.php
index fdf1efcf5e124..5040f9d79156f 100644
--- a/administrator/components/com_config/view/application/html.php
+++ b/administrator/components/com_config/view/application/html.php
@@ -12,9 +12,7 @@
 /**
  * View for the global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigViewApplicationHtml extends ConfigViewCmsHtml
 {
diff --git a/administrator/components/com_config/view/application/json.php b/administrator/components/com_config/view/application/json.php
index 5965d90933926..2c2737668bdbc 100644
--- a/administrator/components/com_config/view/application/json.php
+++ b/administrator/components/com_config/view/application/json.php
@@ -12,9 +12,7 @@
 /**
  * View for the component configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigViewApplicationJson extends ConfigViewCmsJson
 {
diff --git a/administrator/components/com_config/view/component/html.php b/administrator/components/com_config/view/component/html.php
index a35113a7d149a..d05f8980f7a36 100644
--- a/administrator/components/com_config/view/component/html.php
+++ b/administrator/components/com_config/view/component/html.php
@@ -12,9 +12,7 @@
 /**
  * View for the component configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigViewComponentHtml extends ConfigViewCmsHtml
 {
diff --git a/administrator/components/com_contact/controller.php b/administrator/components/com_contact/controller.php
index d9cb6d91e3a91..7325f82f73e98 100644
--- a/administrator/components/com_contact/controller.php
+++ b/administrator/components/com_contact/controller.php
@@ -12,8 +12,6 @@
 /**
  * Component Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
  */
 class ContactController extends JControllerLegacy
 {
diff --git a/administrator/components/com_contact/controllers/contact.php b/administrator/components/com_contact/controllers/contact.php
index db4605ba454ce..548f2f6f5b628 100644
--- a/administrator/components/com_contact/controllers/contact.php
+++ b/administrator/components/com_contact/controllers/contact.php
@@ -12,9 +12,7 @@
 /**
  * Controller for a single contact
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class ContactControllerContact extends JControllerForm
 {
diff --git a/administrator/components/com_contact/controllers/contacts.php b/administrator/components/com_contact/controllers/contacts.php
index 9bce87d5ff44e..3e8171eb0886f 100644
--- a/administrator/components/com_contact/controllers/contacts.php
+++ b/administrator/components/com_contact/controllers/contacts.php
@@ -12,9 +12,7 @@
 /**
  * Articles list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class ContactControllerContacts extends JControllerAdmin
 {
diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php
index 3ae9c78f2747a..a45e60429150e 100644
--- a/administrator/components/com_contact/helpers/contact.php
+++ b/administrator/components/com_contact/helpers/contact.php
@@ -12,9 +12,7 @@
 /**
  * Contact component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class ContactHelper extends JHelperContent
 {
diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php
index 9e2d9aff4859d..7279f3533d2f5 100644
--- a/administrator/components/com_contact/models/contact.php
+++ b/administrator/components/com_contact/models/contact.php
@@ -14,9 +14,7 @@
 /**
  * Item Model for a Contact.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class ContactModelContact extends JModelAdmin
 {
diff --git a/administrator/components/com_contact/models/contacts.php b/administrator/components/com_contact/models/contacts.php
index bb48414577661..4ab0cecf730d5 100644
--- a/administrator/components/com_contact/models/contacts.php
+++ b/administrator/components/com_contact/models/contacts.php
@@ -12,8 +12,6 @@
 /**
  * Methods supporting a list of contact records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
  */
 class ContactModelContacts extends JModelList
 {
diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php
index 357f574959502..dedf691a22054 100644
--- a/administrator/components/com_contact/models/fields/modal/contact.php
+++ b/administrator/components/com_contact/models/fields/modal/contact.php
@@ -12,9 +12,7 @@
 /**
  * Supports a modal contact picker.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldModal_Contact extends JFormField
 {
diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml
index 317a155e4e2d9..2769440300ecc 100644
--- a/administrator/components/com_contact/models/forms/contact.xml
+++ b/administrator/components/com_contact/models/forms/contact.xml
@@ -621,7 +621,7 @@
 			/>
 
 			<field name="linke"
-				type="text"
+				type="url" filter="url"
 				label="COM_CONTACT_FIELD_LINKE_LABEL"
 				description="COM_CONTACT_FIELD_LINKE_DESC"
 				size="30"
diff --git a/administrator/components/com_contact/tables/contact.php b/administrator/components/com_contact/tables/contact.php
index cc0c8b7590d78..4b5d582bb860f 100644
--- a/administrator/components/com_contact/tables/contact.php
+++ b/administrator/components/com_contact/tables/contact.php
@@ -10,8 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_contact
+ * Contact Table class.
  */
 class ContactTableContact extends JTable
 {
@@ -21,7 +20,7 @@ class ContactTableContact extends JTable
 	 * @var    array
 	 * @since  3.3
 	 */
-	protected $jsonEncode = array('params', 'metadata');
+	protected $_jsonEncode = array('params', 'metadata');
 
 	/**
 	 * Constructor
diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php
index cbcc5f987cefb..fcb80bc04036a 100644
--- a/administrator/components/com_contact/views/contact/view.html.php
+++ b/administrator/components/com_contact/views/contact/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a contact.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class ContactViewContact extends JViewLegacy
 {
diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php
index 9647ec5f7aa87..fa44cee6e74b8 100644
--- a/administrator/components/com_contact/views/contacts/tmpl/modal.php
+++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php
@@ -15,6 +15,7 @@
 
 JHtml::_('bootstrap.tooltip');
 JHtml::_('behavior.framework', true);
+JHtml::_('formbehavior.chosen', 'select');
 
 $input     = JFactory::getApplication()->input;
 $function  = $input->getCmd('function', 'jSelectContact');
diff --git a/administrator/components/com_contact/views/contacts/view.html.php b/administrator/components/com_contact/views/contacts/view.html.php
index 9fb24ff4e4410..543e9b86abdfe 100644
--- a/administrator/components/com_contact/views/contacts/view.html.php
+++ b/administrator/components/com_contact/views/contacts/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of contacts.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contact
- * @since       1.6
+ * @since  1.6
  */
 class ContactViewContacts extends JViewLegacy
 {
diff --git a/administrator/components/com_content/controller.php b/administrator/components/com_content/controller.php
index d121baf432050..eec413d5e808d 100644
--- a/administrator/components/com_content/controller.php
+++ b/administrator/components/com_content/controller.php
@@ -12,9 +12,7 @@
 /**
  * Component Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.5
+ * @since  1.5
  */
 class ContentController extends JControllerLegacy
 {
diff --git a/administrator/components/com_content/controllers/articles.php b/administrator/components/com_content/controllers/articles.php
index de2728ca5b2dc..d4c53ab036e02 100644
--- a/administrator/components/com_content/controllers/articles.php
+++ b/administrator/components/com_content/controllers/articles.php
@@ -12,9 +12,7 @@
 /**
  * Articles list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class ContentControllerArticles extends JControllerAdmin
 {
diff --git a/administrator/components/com_content/controllers/featured.php b/administrator/components/com_content/controllers/featured.php
index a3e6ce4bb53bd..7af444e8701ae 100644
--- a/administrator/components/com_content/controllers/featured.php
+++ b/administrator/components/com_content/controllers/featured.php
@@ -12,8 +12,7 @@
 require_once __DIR__ . '/articles.php';
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_content
+ * Featured content controller class.
  */
 class ContentControllerFeatured extends ContentControllerArticles
 {
diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php
index c9ccfea4bbcee..5d368345c7f22 100644
--- a/administrator/components/com_content/helpers/content.php
+++ b/administrator/components/com_content/helpers/content.php
@@ -12,9 +12,7 @@
 /**
  * Content component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class ContentHelper extends JHelperContent
 {
diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php
index b98534a045563..d0a892d2b809d 100644
--- a/administrator/components/com_content/helpers/html/contentadministrator.php
+++ b/administrator/components/com_content/helpers/html/contentadministrator.php
@@ -14,10 +14,7 @@
 /**
  * Content HTML helper
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @since       3.0
+ * @since  3.0
  */
 abstract class JHtmlContentAdministrator
 {
diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
index fb30aadb9eb84..488b2612605e5 100644
--- a/administrator/components/com_content/models/article.php
+++ b/administrator/components/com_content/models/article.php
@@ -14,9 +14,7 @@
 /**
  * Item Model for an Article.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class ContentModelArticle extends JModelAdmin
 {
diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php
index f49fc5632501b..a0e8916ed8872 100644
--- a/administrator/components/com_content/models/articles.php
+++ b/administrator/components/com_content/models/articles.php
@@ -12,10 +12,7 @@
 /**
  * Methods supporting a list of article records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @since       1.6
+ * @since  1.6
  */
 class ContentModelArticles extends JModelList
 {
diff --git a/administrator/components/com_content/models/feature.php b/administrator/components/com_content/models/feature.php
index 9c7a1ebfad222..259463fe4990d 100644
--- a/administrator/components/com_content/models/feature.php
+++ b/administrator/components/com_content/models/feature.php
@@ -13,9 +13,6 @@
 
 /**
  * Feature model.
- *
- * @package     Joomla.Administrator
- * @subpackage  com_content
  */
 class ContentModelFeature extends ContentModelArticle
 {
diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php
index 621f3c89b0dee..3c3fb4bd02e69 100644
--- a/administrator/components/com_content/models/featured.php
+++ b/administrator/components/com_content/models/featured.php
@@ -14,10 +14,7 @@
 /**
  * About Page Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @since       1.6
+ * @since  1.6
  */
 class ContentModelFeatured extends ContentModelArticles
 {
diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php
index c2ffc972b9e98..cba60df80dc49 100644
--- a/administrator/components/com_content/models/fields/modal/article.php
+++ b/administrator/components/com_content/models/fields/modal/article.php
@@ -12,9 +12,7 @@
 /**
  * Supports a modal article picker.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldModal_Article extends JFormField
 {
diff --git a/administrator/components/com_content/tables/featured.php b/administrator/components/com_content/tables/featured.php
index 40b65036184e5..00a68b9f8cb7c 100644
--- a/administrator/components/com_content/tables/featured.php
+++ b/administrator/components/com_content/tables/featured.php
@@ -10,8 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_content
+ * Featured Table class.
  */
 class ContentTableFeatured extends JTable
 {
diff --git a/administrator/components/com_content/views/article/tmpl/pagebreak.php b/administrator/components/com_content/views/article/tmpl/pagebreak.php
index 87363963caf7b..949a05d6e867f 100644
--- a/administrator/components/com_content/views/article/tmpl/pagebreak.php
+++ b/administrator/components/com_content/views/article/tmpl/pagebreak.php
@@ -29,28 +29,18 @@
 
 JFactory::getDocument()->addScriptDeclaration($script);
 ?>
-	<form>
-		<table>
-			<tr>
-				<td class="key" align="right">
-					<label for="title">
-						<?php echo JText::_('COM_CONTENT_PAGEBREAK_TITLE'); ?>
-					</label>
-				</td>
-				<td>
-					<input type="text" id="title" name="title" />
-				</td>
-			</tr>
-			<tr>
-				<td class="key" align="right">
-					<label for="alias">
-						<?php echo JText::_('COM_CONTENT_PAGEBREAK_TOC'); ?>
-					</label>
-				</td>
-				<td>
-					<input type="text" id="alt" name="alt" />
-				</td>
-			</tr>
-		</table>
-	</form>
-	<button onclick="insertPagebreak();"><?php echo JText::_('COM_CONTENT_PAGEBREAK_INSERT_BUTTON'); ?></button>
+<form class="form-horizontal">
+	
+	<div class="control-group">
+		<label for="title" class="control-label"><?php echo JText::_('COM_CONTENT_PAGEBREAK_TITLE'); ?></label>
+		<div class="controls"><input type="text" id="title" name="title" /></div>
+	</div>
+	
+	<div class="control-group">
+		<label for="alias" class="control-label"><?php echo JText::_('COM_CONTENT_PAGEBREAK_TOC'); ?></label>
+		<div class="controls"><input type="text" id="alt" name="alt" /></div>		
+	</div>
+	
+	<button onclick="insertPagebreak();" class="btn btn-primary"><?php echo JText::_('COM_CONTENT_PAGEBREAK_INSERT_BUTTON'); ?></button>
+	
+</form>
\ No newline at end of file
diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php
index 5084c0b441af9..6b9191ab6abc9 100644
--- a/administrator/components/com_content/views/article/view.html.php
+++ b/administrator/components/com_content/views/article/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit an article.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class ContentViewArticle extends JViewLegacy
 {
diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php
index bac008fdc8259..bbef1e515685e 100644
--- a/administrator/components/com_content/views/articles/tmpl/modal.php
+++ b/administrator/components/com_content/views/articles/tmpl/modal.php
@@ -21,6 +21,7 @@
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 JHtml::_('bootstrap.tooltip');
 JHtml::_('behavior.framework', true);
+JHtml::_('formbehavior.chosen', 'select');
 
 $function  = $app->input->getCmd('function', 'jSelectArticle');
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_content/views/articles/view.html.php b/administrator/components/com_content/views/articles/view.html.php
index ff81e3799622f..238fcfaf64a2d 100644
--- a/administrator/components/com_content/views/articles/view.html.php
+++ b/administrator/components/com_content/views/articles/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of articles.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class ContentViewArticles extends JViewLegacy
 {
diff --git a/administrator/components/com_content/views/featured/view.html.php b/administrator/components/com_content/views/featured/view.html.php
index 63a5d49a745c1..67c47ed289d4e 100644
--- a/administrator/components/com_content/views/featured/view.html.php
+++ b/administrator/components/com_content/views/featured/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of featured articles.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_content
- * @since       1.6
+ * @since  1.6
  */
 class ContentViewFeatured extends JViewLegacy
 {
diff --git a/administrator/components/com_contenthistory/controller.php b/administrator/components/com_contenthistory/controller.php
index 7444dfbae5e6a..b70f658950568 100644
--- a/administrator/components/com_contenthistory/controller.php
+++ b/administrator/components/com_contenthistory/controller.php
@@ -12,9 +12,7 @@
 /**
  * Contenthistory Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryController extends JControllerLegacy
 {
diff --git a/administrator/components/com_contenthistory/controllers/history.php b/administrator/components/com_contenthistory/controllers/history.php
index 830b5b52b53f8..c2245e4db0d0a 100644
--- a/administrator/components/com_contenthistory/controllers/history.php
+++ b/administrator/components/com_contenthistory/controllers/history.php
@@ -12,9 +12,7 @@
 /**
  * Contenthistory list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryControllerHistory extends JControllerAdmin
 {
diff --git a/administrator/components/com_contenthistory/controllers/preview.php b/administrator/components/com_contenthistory/controllers/preview.php
index b5558f25462cb..d1e6310ea8370 100644
--- a/administrator/components/com_contenthistory/controllers/preview.php
+++ b/administrator/components/com_contenthistory/controllers/preview.php
@@ -12,9 +12,7 @@
 /**
  * Contenthistory list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryControllerPreview extends JControllerLegacy
 {
diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php
index a92755d102a9b..3be58c0b7e528 100644
--- a/administrator/components/com_contenthistory/helpers/contenthistory.php
+++ b/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -12,9 +12,7 @@
 /**
  * Categories helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryHelper
 {
diff --git a/administrator/components/com_contenthistory/helpers/html/textdiff.php b/administrator/components/com_contenthistory/helpers/html/textdiff.php
index 6a6e88822826a..7f71640b46f45 100644
--- a/administrator/components/com_contenthistory/helpers/html/textdiff.php
+++ b/administrator/components/com_contenthistory/helpers/html/textdiff.php
@@ -12,9 +12,7 @@
 /**
  * HTML utility class for creating text diffs using jQuery, diff_patch_match.js and jquery.pretty-text-diff.js JavaScript libraries.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory.HTML
- * @since       3.2
+ * @since  3.2
  */
 abstract class JHtmlTextdiff
 {
diff --git a/administrator/components/com_contenthistory/models/compare.php b/administrator/components/com_contenthistory/models/compare.php
index 7c2eab88c000c..465bfb77ca841 100644
--- a/administrator/components/com_contenthistory/models/compare.php
+++ b/administrator/components/com_contenthistory/models/compare.php
@@ -14,9 +14,7 @@
 /**
  * Methods supporting a list of contenthistory records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryModelCompare extends JModelItem
 {
diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php
index f019041c018a4..9de82fba75bf3 100644
--- a/administrator/components/com_contenthistory/models/history.php
+++ b/administrator/components/com_contenthistory/models/history.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of contenthistory records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryModelHistory extends JModelList
 {
diff --git a/administrator/components/com_contenthistory/models/preview.php b/administrator/components/com_contenthistory/models/preview.php
index 692fe859701ee..acfb70c89bbf5 100644
--- a/administrator/components/com_contenthistory/models/preview.php
+++ b/administrator/components/com_contenthistory/models/preview.php
@@ -14,9 +14,7 @@
 /**
  * Methods supporting a list of contenthistory records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryModelPreview extends JModelItem
 {
diff --git a/administrator/components/com_contenthistory/views/compare/view.html.php b/administrator/components/com_contenthistory/views/compare/view.html.php
index 89b622d3b8893..ea56efa0b8754 100644
--- a/administrator/components/com_contenthistory/views/compare/view.html.php
+++ b/administrator/components/com_contenthistory/views/compare/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of contenthistory.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryViewCompare extends JViewLegacy
 {
diff --git a/administrator/components/com_contenthistory/views/history/view.html.php b/administrator/components/com_contenthistory/views/history/view.html.php
index f93dbb93facfc..63db3f464497b 100644
--- a/administrator/components/com_contenthistory/views/history/view.html.php
+++ b/administrator/components/com_contenthistory/views/history/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of contenthistory.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       3.2
+ * @since  3.2
  */
 class ContenthistoryViewHistory extends JViewLegacy
 {
diff --git a/administrator/components/com_contenthistory/views/preview/view.html.php b/administrator/components/com_contenthistory/views/preview/view.html.php
index e734d8e170590..7a68c6e2ee1e5 100644
--- a/administrator/components/com_contenthistory/views/preview/view.html.php
+++ b/administrator/components/com_contenthistory/views/preview/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of contenthistory.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_contenthistory
- * @since       1.5
+ * @since  1.5
  */
 class ContenthistoryViewPreview extends JViewLegacy
 {
diff --git a/administrator/components/com_cpanel/controller.php b/administrator/components/com_cpanel/controller.php
index ee287b3cfb433..86066193dc2b5 100644
--- a/administrator/components/com_cpanel/controller.php
+++ b/administrator/components/com_cpanel/controller.php
@@ -12,9 +12,7 @@
 /**
  * Cpanel Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cpanel
- * @since       1.5
+ * @since  1.5
  */
 class CpanelController extends JControllerLegacy
 {
diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php
index 81d84bfa086a3..1f80f105d5e29 100644
--- a/administrator/components/com_cpanel/views/cpanel/view.html.php
+++ b/administrator/components/com_cpanel/views/cpanel/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Cpanel component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_cpanel
- * @since       1.0
+ * @since  1.0
  */
 class CpanelViewCpanel extends JViewLegacy
 {
diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php
index 8d92f6defc7f4..2f58558cb61cd 100644
--- a/administrator/components/com_finder/controller.php
+++ b/administrator/components/com_finder/controller.php
@@ -12,9 +12,7 @@
 /**
  * Base controller class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderController extends JControllerLegacy
 {
diff --git a/administrator/components/com_finder/controllers/filter.php b/administrator/components/com_finder/controllers/filter.php
index fe45dfc5a0174..caddc0d7c36a8 100644
--- a/administrator/components/com_finder/controllers/filter.php
+++ b/administrator/components/com_finder/controllers/filter.php
@@ -12,9 +12,7 @@
 /**
  * Indexer controller class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderControllerFilter extends JControllerForm
 {
diff --git a/administrator/components/com_finder/controllers/filters.php b/administrator/components/com_finder/controllers/filters.php
index 5d485297a10a0..b19b9d595c3a7 100644
--- a/administrator/components/com_finder/controllers/filters.php
+++ b/administrator/components/com_finder/controllers/filters.php
@@ -12,9 +12,7 @@
 /**
  * Filters controller class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderControllerFilters extends JControllerAdmin
 {
diff --git a/administrator/components/com_finder/controllers/index.php b/administrator/components/com_finder/controllers/index.php
index f5e654c4200a7..ab7aba07bf834 100644
--- a/administrator/components/com_finder/controllers/index.php
+++ b/administrator/components/com_finder/controllers/index.php
@@ -12,9 +12,7 @@
 /**
  * Index controller class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderControllerIndex extends JControllerAdmin
 {
diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php
index 15e20bd77597b..2d039292141ec 100644
--- a/administrator/components/com_finder/controllers/indexer.json.php
+++ b/administrator/components/com_finder/controllers/indexer.json.php
@@ -15,9 +15,7 @@
 /**
  * Indexer controller class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderControllerIndexer extends JControllerLegacy
 {
@@ -304,9 +302,7 @@ public static function sendResponse($data = null)
 /**
  * Finder Indexer JSON Response Class
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerResponse
 {
diff --git a/administrator/components/com_finder/controllers/maps.php b/administrator/components/com_finder/controllers/maps.php
index c1f91c610f2ff..02a11ce21dcdd 100644
--- a/administrator/components/com_finder/controllers/maps.php
+++ b/administrator/components/com_finder/controllers/maps.php
@@ -12,9 +12,7 @@
 /**
  * Maps controller class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderControllerMaps extends JControllerAdmin
 {
diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php
index 514f79fddd5f5..ebfdf01feaf18 100644
--- a/administrator/components/com_finder/helpers/finder.php
+++ b/administrator/components/com_finder/helpers/finder.php
@@ -12,9 +12,7 @@
 /**
  * Helper class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderHelper
 {
diff --git a/administrator/components/com_finder/helpers/html/finder.php b/administrator/components/com_finder/helpers/html/finder.php
index 38bd6d9bab181..f464d9f784488 100644
--- a/administrator/components/com_finder/helpers/html/finder.php
+++ b/administrator/components/com_finder/helpers/html/finder.php
@@ -14,9 +14,7 @@
 /**
  * HTML behavior class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 abstract class JHtmlFinder
 {
diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/administrator/components/com_finder/helpers/indexer/adapter.php
index 565a981e67bb3..d90b9dcfc1983 100644
--- a/administrator/components/com_finder/helpers/indexer/adapter.php
+++ b/administrator/components/com_finder/helpers/indexer/adapter.php
@@ -17,9 +17,7 @@
 /**
  * Prototype adapter class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 abstract class FinderIndexerAdapter extends JPlugin
 {
diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
index 4c8d1e8746406..3ac6f7da68588 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -22,9 +22,7 @@
  * Note: All exceptions thrown from within this class should be caught
  * by the controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       3.0
+ * @since  3.0
  */
 class FinderIndexerDriverMysql extends FinderIndexer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
index 19e53e4979730..16f59023ea996 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
@@ -14,9 +14,7 @@
 /**
  * Indexer class supporting PostgreSQL for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       3.0
+ * @since  3.0
  */
 class FinderIndexerDriverPostgresql extends FinderIndexer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
index 7192d57e20a5b..4b04797ed3c81 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
@@ -22,9 +22,7 @@
  * Note: All exceptions thrown from within this class should be caught
  * by the controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       3.1
+ * @since  3.1
  */
 class FinderIndexerDriverSqlsrv extends FinderIndexer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php
index 86d29243fcba3..b7ff9fdda2895 100644
--- a/administrator/components/com_finder/helpers/indexer/helper.php
+++ b/administrator/components/com_finder/helpers/indexer/helper.php
@@ -16,9 +16,7 @@
 /**
  * Helper class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerHelper
 {
diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php
index 95fe02c48e3b6..55c05368b0828 100644
--- a/administrator/components/com_finder/helpers/indexer/indexer.php
+++ b/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -28,9 +28,7 @@
  * Note: All exceptions thrown from within this class should be caught
  * by the controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 abstract class FinderIndexer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php
index 42f22e888fefa..0632bea60fe4e 100644
--- a/administrator/components/com_finder/helpers/indexer/parser.php
+++ b/administrator/components/com_finder/helpers/indexer/parser.php
@@ -12,9 +12,7 @@
 /**
  * Parser base class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 abstract class FinderIndexerParser
 {
diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php
index 1c2c0315f31ef..99f11bf273bbd 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/html.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/html.php
@@ -14,9 +14,7 @@
 /**
  * HTML Parser class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerParserHtml extends FinderIndexerParser
 {
@@ -37,13 +35,25 @@ protected function process($input)
 		// Strip all script tags.
 		$input = preg_replace('#<script[^>]*>.*?</script>#si', ' ', $input);
 
-		// Deal with spacing issues in the input.
-		$input = str_replace('>', '> ', $input);
+		// Strip the tags from the input
+		$input = strip_tags($input);
+
+		// Deal with spacing issues in the input
 		$input = str_replace(array('&nbsp;', '&#160;'), ' ', $input);
 		$input = trim(preg_replace('#\s+#u', ' ', $input));
 
-		// Strip the tags from the input and decode entities.
-		$input = strip_tags($input);
+		// Remove last parts of HTML code which may be caused by a cut of the string
+		if (strpos($input, '>') !== false)
+		{
+			$input = substr($input, strpos($input, '>') + 1);
+		}
+
+		if (strpos($input, '<') !== false)
+		{
+			$input = substr($input, 0, strpos($input, '<'));
+		}
+
+		// Decode entities and remove unneeded white spaces
 		$input = html_entity_decode($input, ENT_QUOTES, 'UTF-8');
 		$input = trim(preg_replace('#\s+#u', ' ', $input));
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser/rtf.php b/administrator/components/com_finder/helpers/indexer/parser/rtf.php
index 290e5a1fbf34c..b944230239da4 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/rtf.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/rtf.php
@@ -14,9 +14,7 @@
 /**
  * RTF Parser class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerParserRtf extends FinderIndexerParser
 {
diff --git a/administrator/components/com_finder/helpers/indexer/parser/txt.php b/administrator/components/com_finder/helpers/indexer/parser/txt.php
index 7f7ad41df3750..32b189978300c 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/txt.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/txt.php
@@ -14,9 +14,7 @@
 /**
  * Text Parser class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerParserTxt extends FinderIndexerParser
 {
diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php
index 9cff3cee507e5..5f32e74f5f0fa 100644
--- a/administrator/components/com_finder/helpers/indexer/query.php
+++ b/administrator/components/com_finder/helpers/indexer/query.php
@@ -17,9 +17,7 @@
 /**
  * Query class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerQuery
 {
diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/administrator/components/com_finder/helpers/indexer/result.php
index ca96805ff5957..994bbf1166a0d 100644
--- a/administrator/components/com_finder/helpers/indexer/result.php
+++ b/administrator/components/com_finder/helpers/indexer/result.php
@@ -19,9 +19,7 @@
  * declared will be pushed into the elements array and can be accessed
  * explicitly using the getElement() method.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerResult
 {
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer.php b/administrator/components/com_finder/helpers/indexer/stemmer.php
index a182a44228666..382b1155e9f47 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer.php
@@ -12,9 +12,7 @@
 /**
  * Stemmer base class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 abstract class FinderIndexerStemmer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
index 24bd6dec6ead7..6e78d1b1475a2 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
@@ -17,9 +17,7 @@
  * First contributed by Eric Sanou (bobotche@hotmail.fr)
  * This class is inspired in  Alexis Ulrich's French stemmer code (http://alx2002.free.fr)
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       3.0
+ * @since  3.0
  */
 class FinderIndexerStemmerFr extends FinderIndexerStemmer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
index 11593e717cc21..b7fde68d858c4 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
@@ -17,9 +17,7 @@
  * This class was adapted from one written by Richard Heyes.
  * See copyright and link information above.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerStemmerPorter_En extends FinderIndexerStemmer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
index 39fd44184e513..7c6ca647efba6 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
@@ -14,9 +14,7 @@
 /**
  * Snowball stemmer class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerStemmerSnowball extends FinderIndexerStemmer
 {
diff --git a/administrator/components/com_finder/helpers/indexer/taxonomy.php b/administrator/components/com_finder/helpers/indexer/taxonomy.php
index 8cd52ea64cc2b..d4ef08687c49b 100644
--- a/administrator/components/com_finder/helpers/indexer/taxonomy.php
+++ b/administrator/components/com_finder/helpers/indexer/taxonomy.php
@@ -12,9 +12,7 @@
 /**
  * Stemmer base class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerTaxonomy
 {
diff --git a/administrator/components/com_finder/helpers/indexer/token.php b/administrator/components/com_finder/helpers/indexer/token.php
index de3affd4c7911..6077b4c59b419 100644
--- a/administrator/components/com_finder/helpers/indexer/token.php
+++ b/administrator/components/com_finder/helpers/indexer/token.php
@@ -12,9 +12,7 @@
 /**
  * Token class for the Finder indexer package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderIndexerToken
 {
diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php
index 16862bd4e2dd9..05e4ad6b42604 100644
--- a/administrator/components/com_finder/helpers/language.php
+++ b/administrator/components/com_finder/helpers/language.php
@@ -12,9 +12,7 @@
 /**
  * Finder language helper class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderHelperLanguage
 {
diff --git a/administrator/components/com_finder/models/fields/directories.php b/administrator/components/com_finder/models/fields/directories.php
index 5f5f4c4ee0846..46426e3102b29 100644
--- a/administrator/components/com_finder/models/fields/directories.php
+++ b/administrator/components/com_finder/models/fields/directories.php
@@ -17,9 +17,7 @@
 /**
  * Renders a list of directories.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class JFormFieldDirectories extends JFormFieldList
 {
diff --git a/administrator/components/com_finder/models/fields/searchfilter.php b/administrator/components/com_finder/models/fields/searchfilter.php
index 999c4f25cbd7e..636ec18036b54 100644
--- a/administrator/components/com_finder/models/fields/searchfilter.php
+++ b/administrator/components/com_finder/models/fields/searchfilter.php
@@ -14,9 +14,7 @@
 /**
  * Search Filter field for the Finder package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class JFormFieldSearchFilter extends JFormFieldList
 {
diff --git a/administrator/components/com_finder/models/filter.php b/administrator/components/com_finder/models/filter.php
index b46e716158500..752a32f1944b7 100644
--- a/administrator/components/com_finder/models/filter.php
+++ b/administrator/components/com_finder/models/filter.php
@@ -12,9 +12,7 @@
 /**
  * Filter model class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderModelFilter extends JModelAdmin
 {
diff --git a/administrator/components/com_finder/models/filters.php b/administrator/components/com_finder/models/filters.php
index 3c22d06195040..b3a6a42f44763 100644
--- a/administrator/components/com_finder/models/filters.php
+++ b/administrator/components/com_finder/models/filters.php
@@ -12,9 +12,7 @@
 /**
  * Filters model class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderModelFilters extends JModelList
 {
diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php
index a8f79b9ec1e7a..fa32738c29885 100644
--- a/administrator/components/com_finder/models/index.php
+++ b/administrator/components/com_finder/models/index.php
@@ -12,9 +12,7 @@
 /**
  * Index model class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderModelIndex extends JModelList
 {
diff --git a/administrator/components/com_finder/models/indexer.php b/administrator/components/com_finder/models/indexer.php
index 7c86d996e3807..70019c09f34e2 100644
--- a/administrator/components/com_finder/models/indexer.php
+++ b/administrator/components/com_finder/models/indexer.php
@@ -12,9 +12,7 @@
 /**
  * Indexer model class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderModelIndexer extends JModelLegacy
 {
diff --git a/administrator/components/com_finder/models/maps.php b/administrator/components/com_finder/models/maps.php
index ec935356d0911..34cfb3fefe405 100644
--- a/administrator/components/com_finder/models/maps.php
+++ b/administrator/components/com_finder/models/maps.php
@@ -12,9 +12,7 @@
 /**
  * Maps model for the Finder package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderModelMaps extends JModelList
 {
diff --git a/administrator/components/com_finder/models/statistics.php b/administrator/components/com_finder/models/statistics.php
index 6df9fb40a3adb..8a707e1e347a8 100644
--- a/administrator/components/com_finder/models/statistics.php
+++ b/administrator/components/com_finder/models/statistics.php
@@ -12,9 +12,7 @@
 /**
  * Statistics model class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderModelStatistics extends JModelLegacy
 {
diff --git a/administrator/components/com_finder/tables/filter.php b/administrator/components/com_finder/tables/filter.php
index b644d9f60d075..8dae3432554ea 100644
--- a/administrator/components/com_finder/tables/filter.php
+++ b/administrator/components/com_finder/tables/filter.php
@@ -12,9 +12,7 @@
 /**
  * Filter table class for the Finder package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderTableFilter extends JTable
 {
diff --git a/administrator/components/com_finder/tables/link.php b/administrator/components/com_finder/tables/link.php
index 92f7b1b0ae338..1beb7e676daff 100644
--- a/administrator/components/com_finder/tables/link.php
+++ b/administrator/components/com_finder/tables/link.php
@@ -12,9 +12,7 @@
 /**
  * Link table class for the Finder package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderTableLink extends JTable
 {
diff --git a/administrator/components/com_finder/tables/map.php b/administrator/components/com_finder/tables/map.php
index 5a77dafc0ad60..e94344a879238 100644
--- a/administrator/components/com_finder/tables/map.php
+++ b/administrator/components/com_finder/tables/map.php
@@ -12,9 +12,7 @@
 /**
  * Map table class for the Finder package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderTableMap extends JTable
 {
diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php
index db4dbdace4bf0..b2e3071791f78 100644
--- a/administrator/components/com_finder/views/filter/view.html.php
+++ b/administrator/components/com_finder/views/filter/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Filter view class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderViewFilter extends JViewLegacy
 {
diff --git a/administrator/components/com_finder/views/filters/view.html.php b/administrator/components/com_finder/views/filters/view.html.php
index 3e1c11e01384b..97ede6ea902d0 100644
--- a/administrator/components/com_finder/views/filters/view.html.php
+++ b/administrator/components/com_finder/views/filters/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Filters view class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderViewFilters extends JViewLegacy
 {
diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php
index 42091e3824e3f..1df937a13469c 100644
--- a/administrator/components/com_finder/views/index/view.html.php
+++ b/administrator/components/com_finder/views/index/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Index view class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderViewIndex extends JViewLegacy
 {
diff --git a/administrator/components/com_finder/views/indexer/view.html.php b/administrator/components/com_finder/views/indexer/view.html.php
index 46c52c8c94e61..215f7ca4cd295 100644
--- a/administrator/components/com_finder/views/indexer/view.html.php
+++ b/administrator/components/com_finder/views/indexer/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Indexer view class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderViewIndexer extends JViewLegacy
 {
diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php
index c45bc8d48442a..d637b93e4f236 100644
--- a/administrator/components/com_finder/views/maps/view.html.php
+++ b/administrator/components/com_finder/views/maps/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Groups view class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderViewMaps extends JViewLegacy
 {
diff --git a/administrator/components/com_finder/views/statistics/view.html.php b/administrator/components/com_finder/views/statistics/view.html.php
index ed3c8714e0b93..487a5f3ae51a2 100644
--- a/administrator/components/com_finder/views/statistics/view.html.php
+++ b/administrator/components/com_finder/views/statistics/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Statistics view class for Finder.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- * @since       2.5
+ * @since  2.5
  */
 class FinderViewStatistics extends JViewLegacy
 {
diff --git a/administrator/components/com_installer/controller.php b/administrator/components/com_installer/controller.php
index e4f15205b6d7f..1dd52bee4c284 100644
--- a/administrator/components/com_installer/controller.php
+++ b/administrator/components/com_installer/controller.php
@@ -12,9 +12,7 @@
 /**
  * Installer Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.5
+ * @since  1.5
  */
 class InstallerController extends JControllerLegacy
 {
diff --git a/administrator/components/com_installer/controllers/database.php b/administrator/components/com_installer/controllers/database.php
index 0808a807ff97d..5196750486c88 100644
--- a/administrator/components/com_installer/controllers/database.php
+++ b/administrator/components/com_installer/controllers/database.php
@@ -12,9 +12,7 @@
 /**
  * Installer Database Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       2.5
+ * @since  2.5
  */
 class InstallerControllerDatabase extends JControllerLegacy
 {
diff --git a/administrator/components/com_installer/controllers/discover.php b/administrator/components/com_installer/controllers/discover.php
index 10a911d099a5c..ab4884ac90e0c 100644
--- a/administrator/components/com_installer/controllers/discover.php
+++ b/administrator/components/com_installer/controllers/discover.php
@@ -12,9 +12,7 @@
 /**
  * Discover Installation Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerControllerDiscover extends JControllerLegacy
 {
diff --git a/administrator/components/com_installer/controllers/install.php b/administrator/components/com_installer/controllers/install.php
index f67c56c5639e0..e19760e8a18a9 100644
--- a/administrator/components/com_installer/controllers/install.php
+++ b/administrator/components/com_installer/controllers/install.php
@@ -10,8 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_installer
+ * Installer controller for Joomla! installer class.
  */
 class InstallerControllerInstall extends JControllerLegacy
 {
@@ -19,6 +18,7 @@ class InstallerControllerInstall extends JControllerLegacy
 	 * Install an extension.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.5
 	 */
 	public function install()
diff --git a/administrator/components/com_installer/controllers/languages.php b/administrator/components/com_installer/controllers/languages.php
index f96c7279a5aed..9524904e628ea 100644
--- a/administrator/components/com_installer/controllers/languages.php
+++ b/administrator/components/com_installer/controllers/languages.php
@@ -11,8 +11,6 @@
 /**
  * Languages Installer Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
  * @since       2.5.7
  */
 class InstallerControllerLanguages extends JControllerLegacy
diff --git a/administrator/components/com_installer/controllers/manage.php b/administrator/components/com_installer/controllers/manage.php
index 029365edad380..9f01427dcd95a 100644
--- a/administrator/components/com_installer/controllers/manage.php
+++ b/administrator/components/com_installer/controllers/manage.php
@@ -12,9 +12,7 @@
 /**
  * Installer Manage Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerControllerManage extends JControllerLegacy
 {
diff --git a/administrator/components/com_installer/controllers/update.php b/administrator/components/com_installer/controllers/update.php
index 37b2aaae7d3e4..ac62085b1cb5e 100644
--- a/administrator/components/com_installer/controllers/update.php
+++ b/administrator/components/com_installer/controllers/update.php
@@ -12,9 +12,7 @@
 /**
  * Installer Update Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerControllerUpdate extends JControllerLegacy
 {
diff --git a/administrator/components/com_installer/helpers/installer.php b/administrator/components/com_installer/helpers/installer.php
index 2a30c544f05b4..62384737f61f5 100644
--- a/administrator/components/com_installer/helpers/installer.php
+++ b/administrator/components/com_installer/helpers/installer.php
@@ -12,9 +12,7 @@
 /**
  * Installer helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerHelper
 {
diff --git a/administrator/components/com_installer/models/database.php b/administrator/components/com_installer/models/database.php
index 3a19f8a90deec..d0f613c0bb5b8 100644
--- a/administrator/components/com_installer/models/database.php
+++ b/administrator/components/com_installer/models/database.php
@@ -15,9 +15,7 @@
 /**
  * Installer Manage Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerModelDatabase extends InstallerModel
 {
diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php
index 33a2509ef8105..14ec62568a356 100644
--- a/administrator/components/com_installer/models/discover.php
+++ b/administrator/components/com_installer/models/discover.php
@@ -14,9 +14,7 @@
 /**
  * Installer Discover Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerModelDiscover extends InstallerModel
 {
diff --git a/administrator/components/com_installer/models/extension.php b/administrator/components/com_installer/models/extension.php
index 6beb8c75144de..780c7eac95a7a 100644
--- a/administrator/components/com_installer/models/extension.php
+++ b/administrator/components/com_installer/models/extension.php
@@ -10,12 +10,9 @@
 defined('_JEXEC') or die;
 
 /**
- * Extension Manager Abstract Extension Model
+ * Extension Manager Abstract Extension Model.
  *
- * @abstract
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.5
+ * @since  1.5
  */
 class InstallerModel extends JModelList
 {
diff --git a/administrator/components/com_installer/models/install.php b/administrator/components/com_installer/models/install.php
index fd54d509899cf..3f9b10adb715a 100644
--- a/administrator/components/com_installer/models/install.php
+++ b/administrator/components/com_installer/models/install.php
@@ -12,9 +12,7 @@
 /**
  * Extension Manager Install Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.5
+ * @since  1.5
  */
 class InstallerModelInstall extends JModelLegacy
 {
@@ -194,7 +192,7 @@ public function install()
 	/**
 	 * Works out an installation package from a HTTP upload
 	 *
-	 * @return package definition or false on failure
+	 * @return array package definition or false on failure
 	 */
 	protected function _getPackageFromUpload()
 	{
@@ -206,6 +204,7 @@ protected function _getPackageFromUpload()
 		if (!(bool) ini_get('file_uploads'))
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'));
+
 			return false;
 		}
 
@@ -213,6 +212,7 @@ protected function _getPackageFromUpload()
 		if (!extension_loaded('zlib'))
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB'));
+
 			return false;
 		}
 
@@ -220,13 +220,31 @@ protected function _getPackageFromUpload()
 		if (!is_array($userfile))
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED'));
+
 			return false;
 		}
 
-		// Check if there was a problem uploading the file.
+		// Is the PHP tmp directory missing?
+		if ($userfile['error'] && ($userfile['error'] == UPLOAD_ERR_NO_TMP_DIR))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR') . '<br/>' . JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'));
+
+			return false;
+		}
+
+		// Is the max upload size too small in php.ini?
+		if ($userfile['error'] && ($userfile['error'] == UPLOAD_ERR_INI_SIZE))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR') . '<br/>' . JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'));
+
+			return false;
+		}
+
+		// Check if there was a different problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'));
+
 			return false;
 		}
 
@@ -264,6 +282,7 @@ protected function _getPackageFromFolder()
 		if (!is_dir($p_dir))
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+
 			return false;
 		}
 
@@ -302,6 +321,7 @@ protected function _getPackageFromUrl()
 		if (!$url)
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL'));
+
 			return false;
 		}
 
@@ -312,10 +332,12 @@ protected function _getPackageFromUrl()
 			$update = new JUpdate;
 			$update->loadFromXML($url);
 			$package_url = trim($update->get('downloadurl', false)->_data);
+
 			if ($package_url)
 			{
 				$url = $package_url;
 			}
+
 			unset($update);
 		}
 
@@ -326,6 +348,7 @@ protected function _getPackageFromUrl()
 		if (!$p_file)
 		{
 			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_INVALID_URL'));
+
 			return false;
 		}
 
diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php
index 834e0432f2d8c..331380888f488 100644
--- a/administrator/components/com_installer/models/languages.php
+++ b/administrator/components/com_installer/models/languages.php
@@ -13,9 +13,7 @@
 /**
  * Languages Installer Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       2.5.7
+ * @since  2.5.7
  */
 class InstallerModelLanguages extends JModelList
 {
diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php
index c49a512ca76c7..a6e666e8a6ec7 100644
--- a/administrator/components/com_installer/models/manage.php
+++ b/administrator/components/com_installer/models/manage.php
@@ -14,9 +14,7 @@
 /**
  * Installer Manage Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.5
+ * @since  1.5
  */
 class InstallerModelManage extends InstallerModel
 {
diff --git a/administrator/components/com_installer/models/update.php b/administrator/components/com_installer/models/update.php
index c3fe804ead712..b8fba28629710 100644
--- a/administrator/components/com_installer/models/update.php
+++ b/administrator/components/com_installer/models/update.php
@@ -14,9 +14,7 @@
 /**
  * Installer Update Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerModelUpdate extends JModelList
 {
diff --git a/administrator/components/com_installer/models/warnings.php b/administrator/components/com_installer/models/warnings.php
index 3f22b1a928ee5..2372de725f739 100644
--- a/administrator/components/com_installer/models/warnings.php
+++ b/administrator/components/com_installer/models/warnings.php
@@ -12,9 +12,7 @@
 /**
  * Extension Manager Templates Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerModelWarnings extends JModelList
 {
@@ -127,13 +125,13 @@ public function getItems()
 					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC'));
 		}
 
-		if ($post_max_size < (4 * 1024 * 1024)) // 4MB
+		if ($post_max_size < (8 * 1024 * 1024)) // 8MB
 		{
 			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE'),
 					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC'));
 		}
 
-		if ($upload_max_filesize < (4 * 1024 * 1024)) // 4MB
+		if ($upload_max_filesize < (8 * 1024 * 1024)) // 8MB
 		{
 			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'),
 					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC'));
diff --git a/administrator/components/com_installer/views/database/view.html.php b/administrator/components/com_installer/views/database/view.html.php
index 6a4138824c4e7..2a5e88e0a4233 100644
--- a/administrator/components/com_installer/views/database/view.html.php
+++ b/administrator/components/com_installer/views/database/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Extension Manager Manage View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerViewDatabase extends InstallerViewDefault
 {
diff --git a/administrator/components/com_installer/views/default/view.php b/administrator/components/com_installer/views/default/view.php
index ac37422e06f7b..ce9f912deb562 100644
--- a/administrator/components/com_installer/views/default/view.php
+++ b/administrator/components/com_installer/views/default/view.php
@@ -12,9 +12,7 @@
 /**
  * Extension Manager Default View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.5
+ * @since  1.5
  */
 class InstallerViewDefault extends JViewLegacy
 {
diff --git a/administrator/components/com_installer/views/discover/view.html.php b/administrator/components/com_installer/views/discover/view.html.php
index 4baf0e961d64c..cbaac6f904fa4 100644
--- a/administrator/components/com_installer/views/discover/view.html.php
+++ b/administrator/components/com_installer/views/discover/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Extension Manager Discover View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerViewDiscover extends InstallerViewDefault
 {
diff --git a/administrator/components/com_installer/views/install/view.html.php b/administrator/components/com_installer/views/install/view.html.php
index 654ef5a2e66fb..98f21217af902 100644
--- a/administrator/components/com_installer/views/install/view.html.php
+++ b/administrator/components/com_installer/views/install/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Extension Manager Install View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.5
+ * @since  1.5
  */
 class InstallerViewInstall extends InstallerViewDefault
 {
diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php
index 7749c66c4e052..98287a2a324b3 100644
--- a/administrator/components/com_installer/views/languages/view.html.php
+++ b/administrator/components/com_installer/views/languages/view.html.php
@@ -13,9 +13,7 @@
 /**
  * Language installer view
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       2.5.7
+ * @since  2.5.7
  */
 class InstallerViewLanguages extends InstallerViewDefault
 {
diff --git a/administrator/components/com_installer/views/manage/view.html.php b/administrator/components/com_installer/views/manage/view.html.php
index 2a668d049ef12..4f92ebb32548c 100644
--- a/administrator/components/com_installer/views/manage/view.html.php
+++ b/administrator/components/com_installer/views/manage/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Extension Manager Manage View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerViewManage extends InstallerViewDefault
 {
diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php
index 120618af6a1e6..0960cf493de87 100644
--- a/administrator/components/com_installer/views/update/view.html.php
+++ b/administrator/components/com_installer/views/update/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Extension Manager Update View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerViewUpdate extends InstallerViewDefault
 {
diff --git a/administrator/components/com_installer/views/warnings/view.html.php b/administrator/components/com_installer/views/warnings/view.html.php
index 8f70c853420ff..9291e489ce1d7 100644
--- a/administrator/components/com_installer/views/warnings/view.html.php
+++ b/administrator/components/com_installer/views/warnings/view.html.php
@@ -14,9 +14,7 @@
 /**
  * Extension Manager Templates View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       1.6
+ * @since  1.6
  */
 class InstallerViewWarnings extends InstallerViewDefault
 {
diff --git a/administrator/components/com_joomlaupdate/controller.php b/administrator/components/com_joomlaupdate/controller.php
index ed33f7f921250..f746171056fa1 100644
--- a/administrator/components/com_joomlaupdate/controller.php
+++ b/administrator/components/com_joomlaupdate/controller.php
@@ -12,19 +12,18 @@
 /**
  * Joomla! Update Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- * @since       2.5.4
+ * @since  2.5.4
  */
 class JoomlaupdateController extends JControllerLegacy
 {
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController		This object to support chaining.
+	 *
 	 * @since	2.5.4
 	 */
 	public function display($cachable = false, $urlparams = false)
@@ -46,7 +45,7 @@ public function display($cachable = false, $urlparams = false)
 			// Get the model for the view.
 			$model = $this->getModel($vName);
 
-			// Perform update source preference check and refresh update information
+			// Perform update source preference check and refresh update information.
 			$model->applyUpdateSite();
 			$model->refreshUpdates();
 
diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php
index 17b3328f85fa0..064fa21eb3463 100644
--- a/administrator/components/com_joomlaupdate/controllers/update.php
+++ b/administrator/components/com_joomlaupdate/controllers/update.php
@@ -12,9 +12,7 @@
 /**
  * The Joomla! update controller for the Update view
  *
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- * @since       2.5.4
+ * @since  2.5.4
  */
 class JoomlaupdateControllerUpdate extends JControllerLegacy
 {
diff --git a/administrator/components/com_joomlaupdate/helpers/download.php b/administrator/components/com_joomlaupdate/helpers/download.php
index 1dfe55657aa0e..e1ac889c17202 100644
--- a/administrator/components/com_joomlaupdate/helpers/download.php
+++ b/administrator/components/com_joomlaupdate/helpers/download.php
@@ -13,16 +13,15 @@
  * Smart download helper. Automatically uses cURL or URL fopen() wrappers to
  * fetch the package.
  *
- * @package  Joomla.Administrator
- * @since    2.5.4
+ * @since  2.5.4
  */
 class AdmintoolsHelperDownload
 {
 	/**
-	 * Downloads from a URL and saves the result as a local file
+	 * Downloads from a URL and saves the result as a local file.
 	 *
-	 * @param   string  $url     The URL to download from
-	 * @param   string  $target  The file path to download to
+	 * @param   string  $url     The URL to download from.
+	 * @param   string  $target  The file path to download to.
 	 *
 	 * @return  bool	True on success
 	 *
@@ -32,7 +31,7 @@ public static function download($url, $target)
 	{
 		jimport('joomla.filesystem.file');
 
-		// Make sure the target does not exist
+		// Make sure the target does not exist.
 		if (JFile::exists($target))
 		{
 			if (!@unlink($target))
@@ -41,7 +40,7 @@ public static function download($url, $target)
 			}
 		}
 
-		// Try to open the output file for writing
+		// Try to open the output file for writing.
 		$fp = @fopen($target, 'wb');
 
 		if ($fp === false)
@@ -65,22 +64,23 @@ public static function download($url, $target)
 			// First try to download directly to file if $fp !== false
 			$adapters = self::getAdapters();
 			$result = false;
+
 			while (!empty($adapters) && ($result === false))
 			{
-				// Run the current download method
+				// Run the current download method.
 				$method = 'get' . strtoupper(array_shift($adapters));
 				$result = self::$method($url, $fp);
 
-				// Check if we have a download
+				// Check if we have a download.
 				if ($result === true)
 				{
-
-					// The download is complete, close the file pointer
+					// The download is complete, close the file pointer.
 					@fclose($fp);
 
 					// If the filesize is not at least 1 byte, we consider it failed.
 					clearstatcache();
 					$filesize = @filesize($target);
+
 					if ($filesize <= 0)
 					{
 						$result = false;
@@ -89,7 +89,7 @@ public static function download($url, $target)
 				}
 			}
 
-			// If we have no download, close the file pointer
+			// If we have no download, close the file pointer.
 			if ($result === false)
 			{
 				@fclose($fp);
@@ -98,8 +98,7 @@ public static function download($url, $target)
 
 		if ($result === false)
 		{
-
-			// Delete the target file if it exists
+			// Delete the target file if it exists.
 			if (file_exists($target))
 			{
 				if ( !@unlink($target) )
@@ -108,7 +107,7 @@ public static function download($url, $target)
 				}
 			}
 
-			// Download and write using JFile::write();
+			// Download and write using JFile::write().
 			$result = JFile::write($target, self::downloadAndReturn($url));
 		}
 
@@ -116,11 +115,11 @@ public static function download($url, $target)
 	}
 
 	/**
-	 * Downloads from a URL and returns the result as a string
+	 * Downloads from a URL and returns the result as a string.
 	 *
-	 * @param   string  $url  The URL to download from
+	 * @param   string  $url  The URL to download from.
 	 *
-	 * @return  mixed Result string on success, false on failure
+	 * @return  mixed Result string on success, false on failure.
 	 *
 	 * @since   2.5.4
 	 */
@@ -131,7 +130,6 @@ public static function downloadAndReturn($url)
 
 		while (!empty($adapters) && ($result === false))
 		{
-
 			// Run the current download method
 			$method = 'get' . strtoupper(array_shift($adapters));
 			$result = self::$method($url, null);
@@ -161,13 +159,13 @@ private static function hasCURL()
 
 	/**
 	 * Downloads the contents of a URL and writes them to disk (if $fp is not null)
-	 * or returns them as a string (if $fp is null)
+	 * or returns them as a string (if $fp is null).
 	 *
-	 * @param   string    $url       The URL to download from
+	 * @param   string    $url       The URL to download from.
 	 * @param   resource  $fp        The file pointer to download to. Omit to return the contents.
 	 * @param   boolean   $nofollow  Should we follow 301/302/307 redirection HTTP headers?
 	 *
-	 * @return   bool|string False on failure, true on success ($fp not null) or the URL contents (if $fp is null)
+	 * @return   bool|string False on failure, true on success ($fp not null) or the URL contents (if $fp is null).
 	 *
 	 * @since   2.5.4
 	 */
@@ -177,7 +175,6 @@ private static function &getCURL($url, $fp = null, $nofollow = false)
 
 		if ( !@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1) && !$nofollow )
 		{
-
 			// Safe Mode is enabled. We have to fetch the headers and
 			// parse any redirections present in there.
 			curl_setopt($ch, CURLOPT_AUTOREFERER, true);
@@ -188,15 +185,16 @@ private static function &getCURL($url, $fp = null, $nofollow = false)
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
 			curl_setopt($ch, CURLOPT_TIMEOUT, 30);
 
-			// Get the headers
+			// Get the headers.
 			$data = curl_exec($ch);
 			curl_close($ch);
 
 			// Init
 			$newURL = $url;
 
-			// Parse the headers
+			// Parse the headers.
 			$lines = explode("\n", $data);
+
 			foreach ($lines as $line)
 			{
 				if (substr($line, 0, 9) == "Location:")
@@ -217,6 +215,7 @@ private static function &getCURL($url, $fp = null, $nofollow = false)
 		else
 		{
 			@curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
+
 			if (function_exists('set_time_limit'))
 			{
 				set_time_limit(0);
@@ -255,7 +254,6 @@ private static function hasFOPEN()
 
 		if (is_null($result))
 		{
-
 			// If we are not allowed to use ini_get, we assume that URL fopen is
 			// disabled.
 			if (!function_exists('ini_get'))
@@ -272,12 +270,12 @@ private static function hasFOPEN()
 	}
 
 	/**
-	 * Download from a URL using URL fopen() wrappers
+	 * Download from a URL using URL fopen() wrappers.
 	 *
-	 * @param   string    $url  The URL to download from
-	 * @param   resource  $fp   The file pointer to download to; leave null to return the d/l file as a string
+	 * @param   string    $url  The URL to download from.
+	 * @param   resource  $fp   The file pointer to download to; leave null to return the d/l file as a string.
 	 *
-	 * @return  bool|string False on failure, true on success ($fp not null) or the URL contents (if $fp is null)
+	 * @return  bool|string False on failure, true on success ($fp not null) or the URL contents (if $fp is null).
 	 *
 	 * @since   2.5.4
 	 */
@@ -295,12 +293,12 @@ private static function &getFOPEN($url, $fp = null)
 		}
 		else
 		{
-
 			// PHP 4 way (actually, it's just a fallback)
 			if ( function_exists('ini_set') )
 			{
 				ini_set('user_agent', 'Joomla/' . JVERSION);
 			}
+
 			$ih = @fopen($url, 'r');
 		}
 
@@ -314,18 +312,22 @@ private static function &getFOPEN($url, $fp = null)
 		$bytes = 0;
 		$result = true;
 		$return = '';
+
 		while (!feof($ih) && $result)
 		{
 			$contents = fread($ih, 4096);
+
 			if ($contents === false)
 			{
 				@fclose($ih);
 				$result = false;
+
 				return $result;
 			}
 			else
 			{
 				$bytes += strlen($contents);
+
 				if (is_resource($fp))
 				{
 					$result = @fwrite($fp, $contents);
@@ -356,7 +358,7 @@ private static function &getFOPEN($url, $fp = null)
 
 	/**
 	 * Detect and return available download "adapters" (not really adapters, as
-	 * we don't follow the Adapter pattern, yet)
+	 * we don't follow the Adapter pattern, yet)..
 	 *
 	 * @return  array
 	 *
@@ -364,26 +366,29 @@ private static function &getFOPEN($url, $fp = null)
 	 */
 	private static function getAdapters()
 	{
-		// Detect available adapters
+		// Detect available adapters.
 		$adapters = array();
+
 		if (self::hasCURL())
 		{
 			$adapters[] = 'curl';
 		}
+
 		if (self::hasFOPEN())
 		{
 			$adapters[] = 'fopen';
 		}
+
 		return $adapters;
 	}
 
 	/**
-	 * Change the permissions of a file, optionally using FTP
+	 * Change the permissions of a file, optionally using FTP.
 	 *
-	 * @param   string  $path  Absolute path to file
-	 * @param   int     $mode  Permissions, e.g. 0755
+	 * @param   string  $path  Absolute path to file.
+	 * @param   int     $mode  Permissions, e.g. 0755.
 	 *
-	 * @return  boolean True on success
+	 * @return  boolean True on success.
 	 *
 	 * @since   2.5.4
 	 */
@@ -392,6 +397,7 @@ private static function chmod($path, $mode)
 		if (is_string($mode))
 		{
 			$mode = octdec($mode);
+
 			if ( ($mode < 0600) || ($mode > 0777) )
 			{
 				$mode = 0755;
@@ -405,7 +411,6 @@ private static function chmod($path, $mode)
 
 		if ($ftpOptions['enabled'] == 1)
 		{
-
 			// Connect the FTP client
 			$ftp = JClientFtp::getInstance(
 				$ftpOptions['host'], $ftpOptions['port'], array(),
@@ -424,11 +429,12 @@ private static function chmod($path, $mode)
 
 			// FTP connector throws an error
 			$ret = $ftp->chmod($path, $mode);
-		} else
+		}
+		else
 		{
 			return false;
 		}
+
 		return $ret;
 	}
-
 }
diff --git a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php b/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
index 954b92726730b..efa34e3f37ed5 100644
--- a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
+++ b/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
@@ -12,9 +12,7 @@
 /**
  * Joomla! update helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- * @since       2.5.4
+ * @since  2.5.4
  */
 class JoomlaupdateHelper
 {
diff --git a/administrator/components/com_joomlaupdate/helpers/select.php b/administrator/components/com_joomlaupdate/helpers/select.php
index 3c33eb03feda8..379ec0aaa65ff 100644
--- a/administrator/components/com_joomlaupdate/helpers/select.php
+++ b/administrator/components/com_joomlaupdate/helpers/select.php
@@ -12,9 +12,7 @@
 /**
  * Joomla! update selection list helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- * @since       2.5.4
+ * @since  2.5.4
  */
 class JoomlaupdateHelperSelect
 {
diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.xml b/administrator/components/com_joomlaupdate/joomlaupdate.xml
index 003bb1d792616..919cfe5e170fc 100644
--- a/administrator/components/com_joomlaupdate/joomlaupdate.xml
+++ b/administrator/components/com_joomlaupdate/joomlaupdate.xml
@@ -26,5 +26,8 @@
 			<language tag="en-GB">language/en-GB.com_joomlaupdate.sys.ini</language>
 		</languages>
 	</administration>
+	<updateservers>
+		<server type="extension" name="Joomla! Update Component Update Site">http://update.joomla.org/core/extensions/com_joomlaupdate.xml</server>
+	</updateservers>
 </extension>
 
diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
index 466e247ece8e0..aa20813816516 100644
--- a/administrator/components/com_joomlaupdate/models/default.php
+++ b/administrator/components/com_joomlaupdate/models/default.php
@@ -15,9 +15,6 @@
 /**
  * Joomla! update overview Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- * @author      nikosdion <nicholas@dionysopoulos.me>
  * @since       2.5.4
  */
 class JoomlaupdateModelDefault extends JModelLegacy
@@ -32,16 +29,17 @@ class JoomlaupdateModelDefault extends JModelLegacy
 	 */
 	public function applyUpdateSite()
 	{
-		// Determine the intended update URL
+		// Determine the intended update URL.
 		$params = JComponentHelper::getParams('com_joomlaupdate');
+
 		switch ($params->get('updatesource', 'nochange'))
 		{
-			// "Long Term Support (LTS) branch - Recommended"
+			// "Long Term Support (LTS) branch - Recommended".
 			case 'lts':
 				$updateURL = 'http://update.joomla.org/core/list.xml';
 				break;
 
-			// "Short term support (STS) branch"
+			// "Short term support (STS) branch".
 			case 'sts':
 				$updateURL = 'http://update.joomla.org/core/sts/list_sts.xml';
 				break;
@@ -51,7 +49,7 @@ public function applyUpdateSite()
 				$updateURL = 'http://update.joomla.org/core/test/list_test.xml';
 				break;
 
-			// "Custom" if custom URL empty no changes
+			// "Custom" if custom URL empty no changes.
 			case 'custom':
 				if ($params->get('customurl', '') != '')
 				{
@@ -63,7 +61,7 @@ public function applyUpdateSite()
 				}
 				break;
 
-			// "Do not change"
+			// "Do not change".
 			case 'nochange':
 			default:
 				return;
@@ -84,12 +82,12 @@ public function applyUpdateSite()
 
 		if ($update_site->location != $updateURL)
 		{
-			// Modify the database record
+			// Modify the database record.
 			$update_site->last_check_timestamp = 0;
 			$update_site->location = $updateURL;
 			$db->updateObject('#__update_sites', $update_site, 'update_site_id');
 
-			// Remove cached updates
+			// Remove cached updates.
 			$query->clear()
 				->delete($db->quoteName('#__updates'))
 				->where($db->quoteName('extension_id') . ' = ' . $db->quote('700'));
@@ -99,9 +97,9 @@ public function applyUpdateSite()
 	}
 
 	/**
-	 * Makes sure that the Joomla! update cache is up-to-date
+	 * Makes sure that the Joomla! update cache is up-to-date.
 	 *
-	 * @param   boolean  $force  Force reload, ignoring the cache timeout
+	 * @param   boolean  $force  Force reload, ignoring the cache timeout.
 	 *
 	 * @return  void
 	 *
@@ -119,12 +117,13 @@ public function refreshUpdates($force = false)
 			$cache_timeout = $update_params->get('cachetimeout', 6, 'int');
 			$cache_timeout = 3600 * $cache_timeout;
 		}
+
 		$updater = JUpdater::getInstance();
 		$updater->findUpdates(700, $cache_timeout);
 	}
 
 	/**
-	 * Returns an array with the Joomla! update information
+	 * Returns an array with the Joomla! update information.
 	 *
 	 * @return  array
 	 *
@@ -132,14 +131,14 @@ public function refreshUpdates($force = false)
 	 */
 	public function getUpdateInformation()
 	{
-		// Initialise the return array
+		// Initialise the return array.
 		$ret = array(
 			'installed' => JVERSION,
 			'latest' => null,
 			'object' => null
 		);
 
-		// Fetch the update information from the database
+		// Fetch the update information from the database.
 		$db = $this->getDbo();
 		$query = $db->getQuery(true)
 			->select('*')
@@ -151,6 +150,7 @@ public function getUpdateInformation()
 		if (is_null($updateObject))
 		{
 			$ret['latest'] = JVERSION;
+
 			return $ret;
 		}
 		else
@@ -158,12 +158,12 @@ public function getUpdateInformation()
 			$ret['latest'] = $updateObject->version;
 		}
 
-		// Fetch the full update details from the update details URL
+		// Fetch the full update details from the update details URL.
 		jimport('joomla.updater.update');
 		$update = new JUpdate;
 		$update->loadFromXML($updateObject->detailsurl);
 
-		// Pass the update object
+		// Pass the update object.
 		if ($ret['latest'] == JVERSION)
 		{
 			$ret['object'] = null;
@@ -177,7 +177,7 @@ public function getUpdateInformation()
 	}
 
 	/**
-	 * Returns an array with the configured FTP options
+	 * Returns an array with the configured FTP options.
 	 *
 	 * @return  array
 	 *
@@ -186,6 +186,7 @@ public function getUpdateInformation()
 	public function getFTPOptions()
 	{
 		$config = JFactory::getConfig();
+
 		return array(
 			'host' => $config->get('ftp_host'),
 			'port' => $config->get('ftp_port'),
@@ -199,7 +200,7 @@ public function getFTPOptions()
 	/**
 	 * Removes all of the updates from the table and enable all update streams.
 	 *
-	 * @return  boolean  Result of operation
+	 * @return  boolean  Result of operation.
 	 *
 	 * @since   3.0
 	 */
@@ -222,19 +223,21 @@ public function purge()
 		if ($db->execute())
 		{
 			$this->_message = JText::_('JLIB_INSTALLER_PURGED_UPDATES');
+
 			return true;
 		}
 		else
 		{
 			$this->_message = JText::_('JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES');
+
 			return false;
 		}
 	}
 
 	/**
-	 * Downloads the update package to the site
+	 * Downloads the update package to the site.
 	 *
-	 * @return  bool|string False on failure, basename of the file in any other case
+	 * @return  bool|string False on failure, basename of the file in any other case.
 	 *
 	 * @since   2.5.4
 	 */
@@ -244,7 +247,7 @@ public function download()
 		$packageURL = $updateInfo['object']->downloadurl->_data;
 		$basename = basename($packageURL);
 
-		// Find the path to the temp directory and the local package
+		// Find the path to the temp directory and the local package.
 		$config = JFactory::getConfig();
 		$tempdir = $config->get('tmp_path');
 		$target = $tempdir . '/' . $basename;
@@ -254,19 +257,20 @@ public function download()
 
 		if (!$exists)
 		{
-			// Not there, let's fetch it
+			// Not there, let's fetch it.
 			return $this->downloadPackage($packageURL, $target);
 		}
 		else
 		{
 			// Is it a 0-byte file? If so, re-download please.
 			$filesize = @filesize($target);
+
 			if (empty($filesize))
 			{
 				return $this->downloadPackage($packageURL, $target);
 			}
 
-			// Yes, it's there, skip downloading
+			// Yes, it's there, skip downloading.
 			return $basename;
 		}
 	}
@@ -298,6 +302,12 @@ protected function downloadPackage($url, $target)
 	}
 
 	/**
+	 * Create restoration file.
+	 *
+	 * @param   string  $basename  Optional base path to the file.
+	 *
+	 * @return  boolean True if successful; false otherwise.
+	 *
 	 * @since  2.5.4
 	 */
 	public function createRestorationFile($basename = null)
@@ -310,10 +320,10 @@ public function createRestorationFile($basename = null)
 		// Do we have to use FTP?
 		$method = $app->input->get('method', 'direct');
 
-		// Get the absolute path to site's root
+		// Get the absolute path to site's root.
 		$siteroot = JPATH_SITE;
 
-		// If the package name is not specified, get it from the update info
+		// If the package name is not specified, get it from the update info.
 		if (empty($basename))
 		{
 			$updateInfo = $this->getUpdateInformation();
@@ -321,7 +331,7 @@ public function createRestorationFile($basename = null)
 			$basename = basename($packageURL);
 		}
 
-		// Get the package name
+		// Get the package name.
 		$config = JFactory::getConfig();
 		$tempdir = $config->get('tmp_path');
 		$file = $tempdir . '/' . $basename;
@@ -347,9 +357,11 @@ public function createRestorationFile($basename = null)
 
 		if ($method == 'ftp')
 		{
-			// Fetch the FTP parameters from the request. Note: The password should be
-			// allowed as raw mode, otherwise something like !@<sdf34>43H% would be
-			// sanitised to !@43H% which is just plain wrong.
+			/*
+			 * Fetch the FTP parameters from the request. Note: The password should be
+			 * allowed as raw mode, otherwise something like !@<sdf34>43H% would be
+			 * sanitised to !@43H% which is just plain wrong.
+			 */
 			$ftp_host = $app->input->get('ftp_host', '');
 			$ftp_port = $app->input->get('ftp_port', '21');
 			$ftp_user = $app->input->get('ftp_user', '');
@@ -358,10 +370,12 @@ public function createRestorationFile($basename = null)
 
 			// Is the tempdir really writable?
 			$writable = @is_writeable($tempdir);
+
 			if ($writable)
 			{
-				// Let's be REALLY sure
+				// Let's be REALLY sure.
 				$fp = @fopen($tempdir . '/test.txt', 'w');
+
 				if ($fp === false)
 				{
 					$writable = false;
@@ -373,16 +387,18 @@ public function createRestorationFile($basename = null)
 				}
 			}
 
-			// If the tempdir is not writable, create a new writable subdirectory
+			// If the tempdir is not writable, create a new writable subdirectory.
 			if (!$writable)
 			{
 				$FTPOptions = JClientHelper::getCredentials('ftp');
 				$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'))
 				{
 					$ftp->mkdir($dest);
 				}
+
 				if (!@chmod($tempdir . '/admintools', 511))
 				{
 					$ftp->chmod($dest, 511);
@@ -391,8 +407,9 @@ public function createRestorationFile($basename = null)
 				$tempdir .= '/admintools';
 			}
 
-			// Just in case the temp-directory was off-root, try using the default tmp directory
+			// Just in case the temp-directory was off-root, try using the default tmp directory.
 			$writable = @is_writeable($tempdir);
+
 			if (!$writable)
 			{
 				$tempdir = JPATH_ROOT . '/tmp';
@@ -400,21 +417,22 @@ public function createRestorationFile($basename = null)
 				// Does the JPATH_ROOT/tmp directory exist?
 				if (!is_dir($tempdir))
 				{
-
 					JFolder::create($tempdir, 511);
 					JFile::write($tempdir . '/.htaccess', "order deny,allow\ndeny from all\nallow from none\n");
 				}
 
-				// If it exists and it is unwritable, try creating a writable admintools subdirectory
+				// If it exists and it is unwritable, try creating a writable admintools subdirectory.
 				if (!is_writable($tempdir))
 				{
 					$FTPOptions = JClientHelper::getCredentials('ftp');
 					$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'))
 					{
 						$ftp->mkdir($dest);
 					}
+
 					if (!@chmod($tempdir . '/admintools', 511))
 					{
 						$ftp->chmod($dest, 511);
@@ -424,7 +442,7 @@ public function createRestorationFile($basename = null)
 				}
 			}
 
-			// If we still have no writable directory, we'll try /tmp and the system's temp-directory
+			// If we still have no writable directory, we'll try /tmp and the system's temp-directory.
 			$writable = @is_writeable($tempdir);
 
 			if (!$writable)
@@ -435,7 +453,7 @@ public function createRestorationFile($basename = null)
 				}
 				else
 				{
-					// Try to find the system temp path
+					// Try to find the system temp path.
 					$tmpfile = @tempnam("dummy", "");
 					$systemp = @dirname($tmpfile);
 					@unlink($tmpfile);
@@ -467,6 +485,7 @@ public function createRestorationFile($basename = null)
 
 		// Remove the old file, if it's there...
 		$configpath = JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php';
+
 		if (JFile::exists($configpath))
 		{
 			JFile::delete($configpath);
@@ -474,12 +493,14 @@ public function createRestorationFile($basename = null)
 
 		// Write new file. First try with JFile.
 		$result = JFile::write($configpath, $data);
-		// In case JFile used FTP but direct access could help
+
+		// In case JFile used FTP but direct access could help.
 		if (!$result)
 		{
 			if (function_exists('file_put_contents'))
 			{
 				$result = @file_put_contents($configpath, $data);
+
 				if ($result !== false)
 				{
 					$result = true;
@@ -492,14 +513,17 @@ public function createRestorationFile($basename = null)
 				if ($fp !== false)
 				{
 					$result = @fwrite($fp, $data);
+
 					if ($result !== false)
 					{
 						$result = true;
 					}
+
 					@fclose($fp);
 				}
 			}
 		}
+
 		return $result;
 	}
 
@@ -508,7 +532,7 @@ public function createRestorationFile($basename = null)
 	 * manifest cache and #__extensions entry. Essentially, it is identical to
 	 * JInstallerFile::install() without the file copy.
 	 *
-	 * @return  boolean True on success
+	 * @return  boolean True on success.
 	 *
 	 * @since   2.5.4
 	 */
@@ -535,7 +559,7 @@ public function finaliseUpgrade()
 		$manifestPath = JPath::clean($installer->getPath('manifest'));
 		$element = preg_replace('/\.xml/', '', basename($manifestPath));
 
-		// Run the script file
+		// Run the script file.
 		$manifestScript = (string) $manifest->scriptfile;
 
 		if ($manifestScript)
@@ -544,7 +568,7 @@ public function finaliseUpgrade()
 
 			if (is_file($manifestScriptFile))
 			{
-				// load the file
+				// Load the file.
 				include_once $manifestScriptFile;
 			}
 
@@ -558,6 +582,7 @@ public function finaliseUpgrade()
 
 		ob_start();
 		ob_implicit_flush(false);
+
 		if ($manifestClass && method_exists($manifestClass, 'preflight'))
 		{
 			if ($manifestClass->preflight('update', $this) === false)
@@ -568,61 +593,72 @@ public function finaliseUpgrade()
 			}
 		}
 
-		$msg = ob_get_contents(); // create msg object; first use here
+		// Create msg object; first use here.
+		$msg = ob_get_contents();
 		ob_end_clean();
 
-		// Get a database connector object
+		// Get a database connector object.
 		$db = JFactory::getDbo();
 
-		// Check to see if a file extension by the same name is already installed
-		// If it is, then update the table because if the files aren't there
-		// we can assume that it was (badly) uninstalled
-		// If it isn't, add an entry to extensions
+		/*
+		 * Check to see if a file extension by the same name is already installed.
+		 * If it is, then update the table because if the files aren't there
+		 * we can assume that it was (badly) uninstalled.
+		 * If it isn't, add an entry to extensions.
+		 */
 		$query = $db->getQuery(true)
 			->select($db->quoteName('extension_id'))
 			->from($db->quoteName('#__extensions'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('file'))
 			->where($db->quoteName('element') . ' = ' . $db->quote('joomla'));
 		$db->setQuery($query);
+
 		try
 		{
 			$db->execute();
 		}
 		catch (RuntimeException $e)
 		{
-			// Install failed, roll back changes
+			// Install failed, roll back changes.
 			$installer->abort(
 				JText::sprintf('JLIB_INSTALLER_ABORT_FILE_ROLLBACK', JText::_('JLIB_INSTALLER_UPDATE'), $db->stderr(true))
 			);
+
 			return false;
 		}
+
 		$id = $db->loadResult();
 		$row = JTable::getInstance('extension');
 
 		if ($id)
 		{
-			// Load the entry and update the manifest_cache
+			// Load the entry and update the manifest_cache.
 			$row->load($id);
-			// Update name
+
+			// Update name.
 			$row->set('name', 'files_joomla');
-			// Update manifest
+
+			// Update manifest.
 			$row->manifest_cache = $installer->generateManifestCache();
+
 			if (!$row->store())
 			{
-				// Install failed, roll back changes
+				// Install failed, roll back changes.
 				$installer->abort(
 					JText::sprintf('JLIB_INSTALLER_ABORT_FILE_ROLLBACK', JText::_('JLIB_INSTALLER_UPDATE'), $db->stderr(true))
 				);
+
 				return false;
 			}
 		}
 		else
 		{
-			// Add an entry to the extension table with a whole heap of defaults
+			// Add an entry to the extension table with a whole heap of defaults.
 			$row->set('name', 'files_joomla');
 			$row->set('type', 'file');
 			$row->set('element', 'joomla');
-			// There is no folder for files so leave it blank
+
+			// There is no folder for files so leave it blank.
 			$row->set('folder', '');
 			$row->set('enabled', 1);
 			$row->set('protected', 0);
@@ -634,12 +670,13 @@ public function finaliseUpgrade()
 
 			if (!$row->store())
 			{
-				// Install failed, roll back changes
+				// Install failed, roll back changes.
 				$installer->abort(JText::sprintf('JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK', $db->stderr(true)));
+
 				return false;
 			}
 
-			// Set the insert id
+			// Set the insert id.
 			$row->set('extension_id', $db->insertid());
 
 			// Since we have created a module item, we add it to the installation step stack
@@ -648,20 +685,22 @@ public function finaliseUpgrade()
 		}
 
 		/*
-		 * Let's run the queries for the file
+		 * Let's run the queries for the file.
 		 */
 		if ($manifest->update)
 		{
 			$result = $installer->parseSchemaUpdates($manifest->update->schemas, $row->extension_id);
+
 			if ($result === false)
 			{
-				// Install failed, rollback changes
+				// Install failed, rollback changes.
 				$installer->abort(JText::sprintf('JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR', $db->stderr(true)));
+
 				return false;
 			}
 		}
 
-		// Start Joomla! 1.6
+		// Start Joomla! 1.6.
 		ob_start();
 		ob_implicit_flush(false);
 
@@ -669,28 +708,31 @@ public function finaliseUpgrade()
 		{
 			if ($manifestClass->update($installer) === false)
 			{
-				// Install failed, rollback changes
+				// Install failed, rollback changes.
 				$installer->abort(JText::_('JLIB_INSTALLER_ABORT_FILE_INSTALL_CUSTOM_INSTALL_FAILURE'));
 
 				return false;
 			}
 		}
 
-		$msg .= ob_get_contents(); // append messages
+		// Append messages.
+		$msg .= ob_get_contents();
 		ob_end_clean();
 
 		// Lastly, we will copy the manifest file to its appropriate place.
 		$manifest = array();
 		$manifest['src'] = $installer->getPath('manifest');
 		$manifest['dest'] = JPATH_MANIFESTS . '/files/' . basename($installer->getPath('manifest'));
+
 		if (!$installer->copyFiles(array($manifest), true))
 		{
-			// Install failed, rollback changes
+			// Install failed, rollback changes.
 			$installer->abort(JText::_('JLIB_INSTALLER_ABORT_FILE_INSTALL_COPY_SETUP'));
+
 			return false;
 		}
 
-		// Clobber any possible pending updates
+		// Clobber any possible pending updates.
 		$update = JTable::getInstance('update');
 		$uid = $update->find(
 			array('element' => $element, 'type' => 'file', 'client_id' => '0', 'folder' => '')
@@ -701,7 +743,7 @@ public function finaliseUpgrade()
 			$update->delete($uid);
 		}
 
-		// And now we run the postflight
+		// And now we run the postflight.
 		ob_start();
 		ob_implicit_flush(false);
 
@@ -710,7 +752,8 @@ public function finaliseUpgrade()
 			$manifestClass->postflight('update', $this);
 		}
 
-		$msg .= ob_get_contents(); // append messages
+		// Append messages.
+		$msg .= ob_get_contents();
 		ob_end_clean();
 
 		if ($msg != '')
@@ -718,14 +761,14 @@ public function finaliseUpgrade()
 			$installer->set('extension_message', $msg);
 		}
 
-		// Refresh versionable assets cache
+		// Refresh versionable assets cache.
 		JFactory::getApplication()->flushAssets();
 
 		return true;
 	}
 
 	/**
-	 * Removes the extracted package file
+	 * Removes the extracted package file.
 	 *
 	 * @return  void
 	 *
@@ -733,32 +776,35 @@ public function finaliseUpgrade()
 	 */
 	public function cleanUp()
 	{
-		// Remove the update package
+		// Remove the update package.
 		$config = JFactory::getConfig();
 		$tempdir = $config->get('tmp_path');
 
 		$file = JFactory::getApplication()->getUserState('com_joomlaupdate.file', null);
 		$target = $tempdir . '/' . $file;
+
 		if (!@unlink($target))
 		{
 			JFile::delete($target);
 		}
 
-		// Remove the restoration.php file
+		// Remove the restoration.php file.
 		$target = JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php';
+
 		if (!@unlink($target))
 		{
 			JFile::delete($target);
 		}
 
-		// Remove joomla.xml from the site's root
+		// Remove joomla.xml from the site's root.
 		$target = JPATH_ROOT . '/joomla.xml';
+
 		if (!@unlink($target))
 		{
 			JFile::delete($target);
 		}
 
-		// Unset the update filename from the session
+		// Unset the update filename from the session.
 		JFactory::getApplication()->setUserState('com_joomlaupdate.file', null);
 	}
 }
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
index 3d47bf6c96d80..83e74c2878dad 100644
--- a/administrator/components/com_joomlaupdate/restore.php
+++ b/administrator/components/com_joomlaupdate/restore.php
@@ -1,82 +1,134 @@
 <?php
+
 /**
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
- * 
- * @copyright 2010-2012 Nicholas K. Dionysopoulos / AkeebaBackup.com
- * @license GNU GPL v2 or - at your option - any later version
- * @package akeebabackup
- * @subpackage kickstart
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
  */
 
 define('_AKEEBA_RESTORATION', 1);
 defined('DS') or define('DS', DIRECTORY_SEPARATOR);
 
 // Unarchiver run states
-define('AK_STATE_NOFILE',	0); // File header not read yet
-define('AK_STATE_HEADER',	1); // File header read; ready to process data
-define('AK_STATE_DATA',		2); // Processing file data
-define('AK_STATE_DATAREAD',	3); // Finished processing file data; ready to post-process
-define('AK_STATE_POSTPROC',	4); // Post-processing
-define('AK_STATE_DONE',		5); // Done with post-processing
+define('AK_STATE_NOFILE', 0); // File header not read yet
+define('AK_STATE_HEADER', 1); // File header read; ready to process data
+define('AK_STATE_DATA', 2); // Processing file data
+define('AK_STATE_DATAREAD', 3); // Finished processing file data; ready to post-process
+define('AK_STATE_POSTPROC', 4); // Post-processing
+define('AK_STATE_DONE', 5); // Done with post-processing
 
 /* Windows system detection */
-if(!defined('_AKEEBA_IS_WINDOWS'))
+if (!defined('_AKEEBA_IS_WINDOWS'))
 {
 	if (function_exists('php_uname'))
+	{
 		define('_AKEEBA_IS_WINDOWS', stristr(php_uname(), 'windows'));
+	}
 	else
+	{
 		define('_AKEEBA_IS_WINDOWS', DIRECTORY_SEPARATOR == '\\');
+	}
+}
+
+// Get the file's root
+if (!defined('KSROOTDIR'))
+{
+	define('KSROOTDIR', dirname(__FILE__));
+}
+if (!defined('KSLANGDIR'))
+{
+	define('KSLANGDIR', KSROOTDIR);
 }
 
 // Make sure the locale is correct for basename() to work
-if(function_exists('setlocale'))
+if (function_exists('setlocale'))
 {
 	@setlocale(LC_ALL, 'en_US.UTF8');
 }
 
 // fnmatch not available on non-POSIX systems
 // Thanks to soywiz@php.net for this usefull alternative function [http://gr2.php.net/fnmatch]
-if (!function_exists('fnmatch')) {
-	function fnmatch($pattern, $string) {
+if (!function_exists('fnmatch'))
+{
+	function fnmatch($pattern, $string)
+	{
 		return @preg_match(
 			'/^' . strtr(addcslashes($pattern, '/\\.+^$(){}=!<>|'),
-		array('*' => '.*', '?' => '.?')) . '$/i', $string
+				array('*' => '.*', '?' => '.?')) . '$/i', $string
 		);
 	}
 }
 
 // Unicode-safe binary data length function
-if(function_exists('mb_strlen')) {
-	function akstringlen($string) { return mb_strlen($string,'8bit'); }
-} else {
-	function akstringlen($string) { return strlen($string); }
+if (!function_exists('akstringlen'))
+{
+	if (function_exists('mb_strlen'))
+	{
+		function akstringlen($string)
+		{
+			return mb_strlen($string, '8bit');
+		}
+	}
+	else
+	{
+		function akstringlen($string)
+		{
+			return strlen($string);
+		}
+	}
 }
 
 /**
  * Gets a query parameter from GET or POST data
+ *
  * @param $key
  * @param $default
  */
-function getQueryParam( $key, $default = null )
+function getQueryParam($key, $default = null)
 {
-	$value = null;
+	$value = $default;
 
-	if(array_key_exists($key, $_REQUEST)) {
+	if (array_key_exists($key, $_REQUEST))
+	{
 		$value = $_REQUEST[$key];
-	} elseif(array_key_exists($key, $_POST)) {
-		$value = $_POST[$key];
-	} elseif(array_key_exists($key, $_GET)) {
-		$value = $_GET[$key];
-	} else {
-		return $default;
 	}
 
-	if(get_magic_quotes_gpc() && !is_null($value)) $value=stripslashes($value);
+	if (get_magic_quotes_gpc() && !is_null($value))
+	{
+		$value = stripslashes($value);
+	}
 
 	return $value;
 }
 
+// Debugging function
+function debugMsg($msg)
+{
+	if (!defined('KSDEBUG'))
+	{
+		return;
+	}
+
+	$fp = fopen('debug.txt', 'at');
+
+	fwrite($fp, $msg . "\n");
+	fclose($fp);
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * Akeeba Backup's JSON compatibility layer
  *
@@ -900,6 +952,16 @@ function json_decode($value, $assoc = false)
 	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * The base class of Akeeba Engine objects. Allows for error and warnings logging
  * and propagation. Largely based on the Joomla! 1.5 JObject class.
@@ -1154,438 +1216,823 @@ private function getItemFromArray($array, $i = null)
 }
 
 /**
- * File post processor engines base class
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
  */
-abstract class AKAbstractPostproc extends AKAbstractObject
-{
-	/** @var string The current (real) file path we'll have to process */
-	protected $filename = null;
-
-	/** @var int The requested permissions */
-	protected $perms = 0755;
-
-	/** @var string The temporary file path we gave to the unarchiver engine */
-	protected $tempFilename = null;
-
-	/** @var int The UNIX timestamp of the file's desired modification date */
-	public $timestamp = 0;
 
+/**
+ * The superclass of all Akeeba Kickstart parts. The "parts" are intelligent stateful
+ * classes which perform a single procedure and have preparation, running and
+ * finalization phases. The transition between phases is handled automatically by
+ * this superclass' tick() final public method, which should be the ONLY public API
+ * exposed to the rest of the Akeeba Engine.
+ */
+abstract class AKAbstractPart extends AKAbstractObject
+{
 	/**
-	 * Processes the current file, e.g. moves it from temp to final location by FTP
+	 * Indicates whether this part has finished its initialisation cycle
+	 * @var boolean
 	 */
-	abstract public function process();
+	protected $isPrepared = false;
 
 	/**
-	 * The unarchiver tells us the path to the filename it wants to extract and we give it
-	 * a different path instead.
-	 * @param string $filename The path to the real file
-	 * @param int $perms The permissions we need the file to have
-	 * @return string The path to the temporary file
+	 * Indicates whether this part has more work to do (it's in running state)
+	 * @var boolean
 	 */
-	abstract public function processFilename($filename, $perms = 0755);
+	protected $isRunning = false;
 
 	/**
-	 * Recursively creates a directory if it doesn't exist
-	 * @param string $dirName The directory to create
-	 * @param int $perms The permissions to give to that directory
+	 * Indicates whether this part has finished its finalization cycle
+	 * @var boolean
 	 */
-	abstract public function createDirRecursive( $dirName, $perms );
-
-	abstract public function chmod( $file, $perms );
-
-	abstract public function unlink( $file );
-
-	abstract public function rmdir( $directory );
-
-	abstract public function rename( $from, $to );
-}
-
-/**
- * The base class of unarchiver classes
- */
-abstract class AKAbstractUnarchiver extends AKAbstractPart
-{
-	/** @var string Archive filename */
-	protected $filename = null;
-
-	/** @var array List of the names of all archive parts */
-	public $archiveList = array();
-
-	/** @var int The total size of all archive parts */
-	public $totalSize = array();
-
-	/** @var integer Current archive part number */
-	protected $currentPartNumber = -1;
-
-	/** @var integer The offset inside the current part */
-	protected $currentPartOffset = 0;
-
-	/** @var bool Should I restore permissions? */
-	protected $flagRestorePermissions = false;
-
-	/** @var AKAbstractPostproc Post processing class */
-	protected $postProcEngine = null;
+	protected $isFinished = false;
 
-	/** @var string Absolute path to prepend to extracted files */
-	protected $addPath = '';
+	/**
+	 * Indicates whether this part has finished its run cycle
+	 * @var boolean
+	 */
+	protected $hasRan = false;
 
-	/** @var array Which files to rename */
-	public $renameFiles = array();
+	/**
+	 * The name of the engine part (a.k.a. Domain), used in return table
+	 * generation.
+	 * @var string
+	 */
+	protected $active_domain = "";
 
-	/** @var array Which directories to rename */
-	public $renameDirs = array();
+	/**
+	 * The step this engine part is in. Used verbatim in return table and
+	 * should be set by the code in the _run() method.
+	 * @var string
+	 */
+	protected $active_step = "";
 
-	/** @var array Which files to skip */
-	public $skipFiles = array();
+	/**
+	 * A more detailed description of the step this engine part is in. Used
+	 * verbatim in return table and should be set by the code in the _run()
+	 * method.
+	 * @var string
+	 */
+	protected $active_substep = "";
 
-	/** @var integer Chunk size for processing */
-	protected $chunkSize = 524288;
+	/**
+	 * Any configuration variables, in the form of an array.
+	 * @var array
+	 */
+	protected $_parametersArray = array();
 
-	/** @var resource File pointer to the current archive part file */
-	protected $fp = null;
+	/** @var string The database root key */
+	protected $databaseRoot = array();
 
-	/** @var int Run state when processing the current archive file */
-	protected $runState = null;
+	/** @var int Last reported warnings's position in array */
+	private $warnings_pointer = -1;
 
-	/** @var stdClass File header data, as read by the readFileHeader() method */
-	protected $fileHeader = null;
+	/** @var array An array of observers */
+	protected $observers = array();
 
-	/** @var int How much of the uncompressed data we've read so far */
-	protected $dataReadLength = 0;
+	/**
+	 * Runs the preparation for this part. Should set _isPrepared
+	 * to true
+	 */
+	abstract protected function _prepare();
 
 	/**
-	 * Public constructor
+	 * Runs the finalisation process for this part. Should set
+	 * _isFinished to true.
 	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
+	abstract protected function _finalize();
 
 	/**
-	 * Wakeup function, called whenever the class is unserialized
+	 * Runs the main functionality loop for this part. Upon calling,
+	 * should set the _isRunning to true. When it finished, should set
+	 * the _hasRan to true. If an error is encountered, setError should
+	 * be used.
 	 */
-	public function __wakeup()
-	{
-		if($this->currentPartNumber >= 0)
-		{
-			$this->fp = @fopen($this->archiveList[$this->currentPartNumber], 'rb');
-			if( (is_resource($this->fp)) && ($this->currentPartOffset > 0) )
-			{
-				@fseek($this->fp, $this->currentPartOffset);
-			}
-		}
-	}
+	abstract protected function _run();
 
 	/**
-	 * Sleep function, called whenever the class is serialized
+	 * Sets the BREAKFLAG, which instructs this engine part that the current step must break immediately,
+	 * in fear of timing out.
 	 */
-	public function shutdown()
+	protected function setBreakFlag()
 	{
-		if(is_resource($this->fp))
-		{
-			$this->currentPartOffset = @ftell($this->fp);
-			@fclose($this->fp);
-		}
+		AKFactory::set('volatile.breakflag', true);
 	}
 
 	/**
-	 * Implements the abstract _prepare() method
+	 * Sets the engine part's internal state, in an easy to use manner
+	 *
+	 * @param	string	$state			One of init, prepared, running, postrun, finished, error
+	 * @param	string	$errorMessage	The reported error message, should the state be set to error
 	 */
-	final protected function _prepare()
+	protected function setState($state = 'init', $errorMessage='Invalid setState argument')
 	{
-		parent::__construct();
-
-		if( count($this->_parametersArray) > 0 )
+		switch($state)
 		{
-			foreach($this->_parametersArray as $key => $value)
-			{
-				switch($key)
-				{
-					case 'filename': // Archive's absolute filename
-						$this->filename = $value;
-						break;
-
-					case 'restore_permissions': // Should I restore permissions?
-						$this->flagRestorePermissions = $value;
-						break;
+			case 'init':
+				$this->isPrepared = false;
+				$this->isRunning  = false;
+				$this->isFinished = false;
+				$this->hasRun     = false;
+				break;
 
-					case 'post_proc': // Should I use FTP?
-						$this->postProcEngine = AKFactory::getpostProc($value);
-						break;
+			case 'prepared':
+				$this->isPrepared = true;
+				$this->isRunning  = false;
+				$this->isFinished = false;
+				$this->hasRun     = false;
+				break;
 
-					case 'add_path': // Path to prepend
-						$this->addPath = $value;
-						$this->addPath = str_replace('\\','/',$this->addPath);
-						$this->addPath = rtrim($this->addPath,'/');
-						if(!empty($this->addPath)) $this->addPath .= '/';
-						break;
+			case 'running':
+				$this->isPrepared = true;
+				$this->isRunning  = true;
+				$this->isFinished = false;
+				$this->hasRun     = false;
+				break;
 
-					case 'rename_files': // Which files to rename (hash array)
-						$this->renameFiles = $value;
-						break;
-					
-					case 'rename_dirs': // Which files to rename (hash array)
-						$this->renameDirs = $value;
-						break;
+			case 'postrun':
+				$this->isPrepared = true;
+				$this->isRunning  = false;
+				$this->isFinished = false;
+				$this->hasRun     = true;
+				break;
 
-					case 'skip_files': // Which files to skip (indexed array)
-						$this->skipFiles = $value;
-						break;
-				}
-			}
+			case 'finished':
+				$this->isPrepared = true;
+				$this->isRunning  = false;
+				$this->isFinished = true;
+				$this->hasRun     = false;
+				break;
+
+			case 'error':
+			default:
+				$this->setError($errorMessage);
+				break;
 		}
+	}
 
-		$this->scanArchives();
+	/**
+	 * The public interface to an engine part. This method takes care for
+	 * calling the correct method in order to perform the initialisation -
+	 * run - finalisation cycle of operation and return a proper reponse array.
+	 * @return	array	A Reponse Array
+	 */
+	final public function tick()
+	{
+		// Call the right action method, depending on engine part state
+		switch( $this->getState() )
+		{
+			case "init":
+				$this->_prepare();
+				break;
+			case "prepared":
+				$this->_run();
+				break;
+			case "running":
+				$this->_run();
+				break;
+			case "postrun":
+				$this->_finalize();
+				break;
+		}
 
-		$this->readArchiveHeader();
-		$errMessage = $this->getError();
-		if(!empty($errMessage))
+		// Send a Return Table back to the caller
+		$out = $this->_makeReturnTable();
+		return $out;
+	}
+
+	/**
+	 * Returns a copy of the class's status array
+	 * @return array
+	 */
+	public function getStatusArray()
+	{
+		return $this->_makeReturnTable();
+	}
+
+	/**
+	 * Sends any kind of setup information to the engine part. Using this,
+	 * we avoid passing parameters to the constructor of the class. These
+	 * parameters should be passed as an indexed array and should be taken
+	 * into account during the preparation process only. This function will
+	 * set the error flag if it's called after the engine part is prepared.
+	 *
+	 * @param array $parametersArray The parameters to be passed to the
+	 * engine part.
+	 */
+	final public function setup( $parametersArray )
+	{
+		if( $this->isPrepared )
 		{
-			$this->setState('error', $errMessage);
+			$this->setState('error', "Can't modify configuration after the preparation of " . $this->active_domain);
 		}
 		else
 		{
-			$this->runState = AK_STATE_NOFILE;
-			$this->setState('prepared');
+			$this->_parametersArray = $parametersArray;
+			if(array_key_exists('root', $parametersArray))
+			{
+				$this->databaseRoot = $parametersArray['root'];
+			}
 		}
 	}
 
-	protected function _run()
+	/**
+	 * Returns the state of this engine part.
+	 *
+	 * @return string The state of this engine part. It can be one of
+	 * error, init, prepared, running, postrun, finished.
+	 */
+	final public function getState()
 	{
-		if($this->getState() == 'postrun') return;
-
-		$this->setState('running');
-
-		$timer = AKFactory::getTimer();
-
-		$status = true;
-		while( $status && ($timer->getTimeLeft() > 0) )
+		if( $this->getError() )
 		{
-			switch( $this->runState )
-			{
-				case AK_STATE_NOFILE:
-					$status = $this->readFileHeader();
-					if($status)
-					{
-						// Send start of file notification
-						$message = new stdClass;
-						$message->type = 'startfile';
-						$message->content = new stdClass;
-						if( array_key_exists('realfile', get_object_vars($this->fileHeader)) ) {
-							$message->content->realfile = $this->fileHeader->realFile;
-						} else {
-							$message->content->realfile = $this->fileHeader->file;
-						}
-						$message->content->file = $this->fileHeader->file;
-						if( array_key_exists('compressed', get_object_vars($this->fileHeader)) ) {
-							$message->content->compressed = $this->fileHeader->compressed;
-						} else {
-							$message->content->compressed = 0;
-						}
-						$message->content->uncompressed = $this->fileHeader->uncompressed;
-						$this->notify($message);
-					}
-					break;
-
-				case AK_STATE_HEADER:
-				case AK_STATE_DATA:
-					$status = $this->processFileData();
-					break;
+			return "error";
+		}
 
-				case AK_STATE_DATAREAD:
-				case AK_STATE_POSTPROC:
-					$this->postProcEngine->timestamp = $this->fileHeader->timestamp;
-					$status = $this->postProcEngine->process();
-					$this->propagateFromObject( $this->postProcEngine );
-					$this->runState = AK_STATE_DONE;
-					break;
+		if( !($this->isPrepared) )
+		{
+			return "init";
+		}
 
-				case AK_STATE_DONE:
-				default:
-					if($status)
-					{
-						// Send end of file notification
-						$message = new stdClass;
-						$message->type = 'endfile';
-						$message->content = new stdClass;
-						if( array_key_exists('realfile', get_object_vars($this->fileHeader)) ) {
-							$message->content->realfile = $this->fileHeader->realFile;
-						} else {
-							$message->content->realfile = $this->fileHeader->file;
-						}
-						$message->content->file = $this->fileHeader->file;
-						if( array_key_exists('compressed', get_object_vars($this->fileHeader)) ) {
-							$message->content->compressed = $this->fileHeader->compressed;
-						} else {
-							$message->content->compressed = 0;
-						}
-						$message->content->uncompressed = $this->fileHeader->uncompressed;
-						$this->notify($message);
-					}
-					$this->runState = AK_STATE_NOFILE;
-					continue;
-			}
+		if( !($this->isFinished) && !($this->isRunning) && !( $this->hasRun ) && ($this->isPrepared) )
+		{
+			return "prepared";
 		}
 
-		$error = $this->getError();
-		if( !$status && ($this->runState == AK_STATE_NOFILE) && empty( $error ) )
+		if ( !($this->isFinished) && $this->isRunning && !( $this->hasRun ) )
 		{
-			// We just finished
-			$this->setState('postrun');
+			return "running";
 		}
-		elseif( !empty($error) )
+
+		if ( !($this->isFinished) && !($this->isRunning) && $this->hasRun )
 		{
-			$this->setState( 'error', $error );
+			return "postrun";
 		}
-	}
 
-	protected function _finalize()
-	{
-		// Nothing to do
-		$this->setState('finished');
+		if ( $this->isFinished )
+		{
+			return "finished";
+		}
 	}
 
 	/**
-	 * Returns the base extension of the file, e.g. '.jpa'
-	 * @return string
+	 * Constructs a Response Array based on the engine part's state.
+	 * @return array The Response Array for the current state
 	 */
-	private function getBaseExtension()
+	final protected function _makeReturnTable()
 	{
-		static $baseextension;
-
-		if(empty($baseextension))
+		// Get a list of warnings
+		$warnings = $this->getWarnings();
+		// Report only new warnings if there is no warnings queue size
+		if( $this->_warnings_queue_size == 0 )
 		{
-			$basename = basename($this->filename);
-			$lastdot = strrpos($basename,'.');
-			$baseextension = substr($basename, $lastdot);
+			if( ($this->warnings_pointer > 0) && ($this->warnings_pointer < (count($warnings)) ) )
+			{
+				$warnings = array_slice($warnings, $this->warnings_pointer + 1);
+				$this->warnings_pointer += count($warnings);
+			}
+			else
+			{
+				$this->warnings_pointer = count($warnings);
+			}
 		}
 
-		return $baseextension;
+		$out =  array(
+			'HasRun'	=> (!($this->isFinished)),
+			'Domain'	=> $this->active_domain,
+			'Step'		=> $this->active_step,
+			'Substep'	=> $this->active_substep,
+			'Error'		=> $this->getError(),
+			'Warnings'	=> $warnings
+		);
+
+		return $out;
 	}
 
-	/**
-	 * Scans for archive parts
-	 */
-	private function scanArchives()
+	final protected function setDomain($new_domain)
 	{
-		$privateArchiveList = array();
+		$this->active_domain = $new_domain;
+	}
 
-		// Get the components of the archive filename
-		$dirname = dirname($this->filename);
-		$base_extension = $this->getBaseExtension();
-		$basename = basename($this->filename, $base_extension);
-		$this->totalSize = 0;
+	final public function getDomain()
+	{
+		return $this->active_domain;
+	}
 
-		// Scan for multiple parts until we don't find any more of them
-		$count = 0;
-		$found = true;
-		$this->archiveList = array();
-		while($found)
-		{
-			++$count;
-			$extension = substr($base_extension, 0, 2).sprintf('%02d', $count);
-			$filename = $dirname.DIRECTORY_SEPARATOR.$basename.$extension;
-			$found = file_exists($filename);
-			if($found)
-			{
-				// Add yet another part, with a numeric-appended filename
-				$this->archiveList[] = $filename;
+	final protected function setStep($new_step)
+	{
+		$this->active_step = $new_step;
+	}
 
-				$filesize = @filesize($filename);
-				$this->totalSize += $filesize;
+	final public function getStep()
+	{
+		return $this->active_step;
+	}
 
-				$privateArchiveList[] = array($filename, $filesize);
-			}
-			else
-			{
-				// Add the last part, with the regular extension
-				$this->archiveList[] = $this->filename;
+	final protected function setSubstep($new_substep)
+	{
+		$this->active_substep = $new_substep;
+	}
 
-				$filename = $this->filename;
-				$filesize = @filesize($filename);
-				$this->totalSize += $filesize;
+	final public function getSubstep()
+	{
+		return $this->active_substep;
+	}
 
-				$privateArchiveList[] = array($filename, $filesize);
-			}
-		}
+	/**
+	 * Attaches an observer object
+	 * @param AKAbstractPartObserver $obs
+	 */
+	function attach(AKAbstractPartObserver $obs) {
+        $this->observers["$obs"] = $obs;
+    }
 
-		$this->currentPartNumber = -1;
-		$this->currentPartOffset = 0;
-		$this->runState = AK_STATE_NOFILE;
+	/**
+	 * Dettaches an observer object
+	 * @param AKAbstractPartObserver $obs
+	 */
+    function detach(AKAbstractPartObserver $obs) {
+        delete($this->observers["$obs"]);
+    }
 
-		// Send start of file notification
-		$message = new stdClass;
-		$message->type = 'totalsize';
-		$message->content = new stdClass;
-		$message->content->totalsize = $this->totalSize;
-		$message->content->filelist = $privateArchiveList;
-		$this->notify($message);
-	}
+    /**
+     * Notifies observers each time something interesting happened to the part
+     * @param mixed $message The event object
+     */
+	protected function notify($message) {
+        foreach ($this->observers as $obs) {
+            $obs->update($this, $message);
+        }
+    }
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The base class of unarchiver classes
+ */
+abstract class AKAbstractUnarchiver extends AKAbstractPart
+{
+	/** @var string Archive filename */
+	protected $filename = null;
+
+	/** @var array List of the names of all archive parts */
+	public $archiveList = array();
+
+	/** @var int The total size of all archive parts */
+	public $totalSize = array();
+
+	/** @var integer Current archive part number */
+	protected $currentPartNumber = -1;
+
+	/** @var integer The offset inside the current part */
+	protected $currentPartOffset = 0;
+
+	/** @var bool Should I restore permissions? */
+	protected $flagRestorePermissions = false;
+
+	/** @var AKAbstractPostproc Post processing class */
+	protected $postProcEngine = null;
+
+	/** @var string Absolute path to prepend to extracted files */
+	protected $addPath = '';
+
+	/** @var array Which files to rename */
+	public $renameFiles = array();
+
+	/** @var array Which directories to rename */
+	public $renameDirs = array();
+
+	/** @var array Which files to skip */
+	public $skipFiles = array();
+
+	/** @var integer Chunk size for processing */
+	protected $chunkSize = 524288;
+
+	/** @var resource File pointer to the current archive part file */
+	protected $fp = null;
+
+	/** @var int Run state when processing the current archive file */
+	protected $runState = null;
+
+	/** @var stdClass File header data, as read by the readFileHeader() method */
+	protected $fileHeader = null;
+
+	/** @var int How much of the uncompressed data we've read so far */
+	protected $dataReadLength = 0;
+
+	/** @var array Unwriteable files in these directories are always ignored and do not cause errors when not extracted */
+	protected $ignoreDirectories = array();
 
 	/**
-	 * Opens the next part file for reading
+	 * Public constructor
 	 */
-	protected function nextFile()
+	public function __construct()
 	{
-		++$this->currentPartNumber;
+		parent::__construct();
+	}
 
-		if( $this->currentPartNumber > (count($this->archiveList) - 1) )
+	/**
+	 * Wakeup function, called whenever the class is unserialized
+	 */
+	public function __wakeup()
+	{
+		if($this->currentPartNumber >= 0)
 		{
-			$this->setState('postrun');
-			return false;
+			$this->fp = @fopen($this->archiveList[$this->currentPartNumber], 'rb');
+			if( (is_resource($this->fp)) && ($this->currentPartOffset > 0) )
+			{
+				@fseek($this->fp, $this->currentPartOffset);
+			}
 		}
-		else
+	}
+
+	/**
+	 * Sleep function, called whenever the class is serialized
+	 */
+	public function shutdown()
+	{
+		if(is_resource($this->fp))
 		{
-			if( is_resource($this->fp) ) @fclose($this->fp);
-			$this->fp = @fopen( $this->archiveList[$this->currentPartNumber], 'rb' );
-			fseek($this->fp, 0);
-			$this->currentPartOffset = 0;
-			return true;
+			$this->currentPartOffset = @ftell($this->fp);
+			@fclose($this->fp);
 		}
 	}
 
 	/**
-	 * Returns true if we have reached the end of file
-	 * @param $local bool True to return EOF of the local file, false (default) to return if we have reached the end of the archive set
-	 * @return bool True if we have reached End Of File
+	 * Implements the abstract _prepare() method
 	 */
-	protected function isEOF($local = false)
+	final protected function _prepare()
 	{
-		$eof = @feof($this->fp);
+		parent::__construct();
 
-		if(!$eof)
+		if( count($this->_parametersArray) > 0 )
 		{
-			// Border case: right at the part's end (eeeek!!!). For the life of me, I don't understand why
-			// feof() doesn't report true. It expects the fp to be positioned *beyond* the EOF to report
-			// true. Incredible! :(
-			$position = @ftell($this->fp);
-			$filesize = @filesize( $this->archiveList[$this->currentPartNumber] );
-			if( $position >= $filesize  ) $eof = true;
+			foreach($this->_parametersArray as $key => $value)
+			{
+				switch($key)
+				{
+					// Archive's absolute filename
+					case 'filename':
+						$this->filename = $value;
+
+						// Sanity check
+						if (!empty($value))
+						{
+							$value = strtolower($value);
+
+							if (strlen($value) > 6)
+							{
+								if (
+									(substr($value, 0, 7) == 'http://')
+									|| (substr($value, 0, 8) == 'https://')
+									|| (substr($value, 0, 6) == 'ftp://')
+									|| (substr($value, 0, 7) == 'ssh2://')
+									|| (substr($value, 0, 6) == 'ssl://')
+								)
+								{
+									$this->setState('error', 'Invalid archive location');
+								}
+							}
+						}
+
+
+
+						break;
+
+					// Should I restore permissions?
+					case 'restore_permissions':
+						$this->flagRestorePermissions = $value;
+						break;
+
+					// Should I use FTP?
+					case 'post_proc':
+						$this->postProcEngine = AKFactory::getpostProc($value);
+						break;
+
+					// Path to add in the beginning
+					case 'add_path':
+						$this->addPath = $value;
+						$this->addPath = str_replace('\\','/',$this->addPath);
+						$this->addPath = rtrim($this->addPath,'/');
+						if(!empty($this->addPath)) $this->addPath .= '/';
+						break;
+
+					// Which files to rename (hash array)
+					case 'rename_files':
+						$this->renameFiles = $value;
+						break;
+
+					// Which files to rename (hash array)
+					case 'rename_dirs':
+						$this->renameDirs = $value;
+						break;
+
+					// Which files to skip (indexed array)
+					case 'skip_files':
+						$this->skipFiles = $value;
+						break;
+
+					// Which directories to ignore when we can't write files in them (indexed array)
+					case 'ignoredirectories':
+						$this->ignoreDirectories = $value;
+						break;
+				}
+			}
 		}
 
-		if($local)
+		$this->scanArchives();
+
+		$this->readArchiveHeader();
+		$errMessage = $this->getError();
+		if(!empty($errMessage))
 		{
-			return $eof;
+			$this->setState('error', $errMessage);
 		}
 		else
 		{
-			return $eof && ($this->currentPartNumber >= (count($this->archiveList)-1) );
+			$this->runState = AK_STATE_NOFILE;
+			$this->setState('prepared');
 		}
 	}
 
-	/**
-	 * Tries to make a directory user-writable so that we can write a file to it
-	 * @param $path string A path to a file
-	 */
-	protected function setCorrectPermissions($path)
+	protected function _run()
 	{
-		static $rootDir = null;
-		
-		if(is_null($rootDir)) {
-			$rootDir = rtrim(AKFactory::get('kickstart.setup.destdir',''),'/\\');
-		}
-		
-		$directory = rtrim(dirname($path),'/\\');
+		if($this->getState() == 'postrun') return;
+
+		$this->setState('running');
+
+		$timer = AKFactory::getTimer();
+
+		$status = true;
+		while( $status && ($timer->getTimeLeft() > 0) )
+		{
+			switch( $this->runState )
+			{
+				case AK_STATE_NOFILE:
+					debugMsg(__CLASS__.'::_run() - Reading file header');
+					$status = $this->readFileHeader();
+					if($status)
+					{
+						debugMsg(__CLASS__.'::_run() - Preparing to extract '.$this->fileHeader->realFile);
+						// Send start of file notification
+						$message = new stdClass;
+						$message->type = 'startfile';
+						$message->content = new stdClass;
+						if( array_key_exists('realfile', get_object_vars($this->fileHeader)) ) {
+							$message->content->realfile = $this->fileHeader->realFile;
+						} else {
+							$message->content->realfile = $this->fileHeader->file;
+						}
+						$message->content->file = $this->fileHeader->file;
+						if( array_key_exists('compressed', get_object_vars($this->fileHeader)) ) {
+							$message->content->compressed = $this->fileHeader->compressed;
+						} else {
+							$message->content->compressed = 0;
+						}
+						$message->content->uncompressed = $this->fileHeader->uncompressed;
+						$this->notify($message);
+					} else {
+						debugMsg(__CLASS__.'::_run() - Could not read file header');
+					}
+					break;
+
+				case AK_STATE_HEADER:
+				case AK_STATE_DATA:
+					debugMsg(__CLASS__.'::_run() - Processing file data');
+					$status = $this->processFileData();
+					break;
+
+				case AK_STATE_DATAREAD:
+				case AK_STATE_POSTPROC:
+					debugMsg(__CLASS__.'::_run() - Calling post-processing class');
+					$this->postProcEngine->timestamp = $this->fileHeader->timestamp;
+					$status = $this->postProcEngine->process();
+					$this->propagateFromObject( $this->postProcEngine );
+					$this->runState = AK_STATE_DONE;
+					break;
+
+				case AK_STATE_DONE:
+				default:
+					if($status)
+					{
+						debugMsg(__CLASS__.'::_run() - Finished extracting file');
+						// Send end of file notification
+						$message = new stdClass;
+						$message->type = 'endfile';
+						$message->content = new stdClass;
+						if( array_key_exists('realfile', get_object_vars($this->fileHeader)) ) {
+							$message->content->realfile = $this->fileHeader->realFile;
+						} else {
+							$message->content->realfile = $this->fileHeader->file;
+						}
+						$message->content->file = $this->fileHeader->file;
+						if( array_key_exists('compressed', get_object_vars($this->fileHeader)) ) {
+							$message->content->compressed = $this->fileHeader->compressed;
+						} else {
+							$message->content->compressed = 0;
+						}
+						$message->content->uncompressed = $this->fileHeader->uncompressed;
+						$this->notify($message);
+					}
+					$this->runState = AK_STATE_NOFILE;
+					continue;
+			}
+		}
+
+		$error = $this->getError();
+		if( !$status && ($this->runState == AK_STATE_NOFILE) && empty( $error ) )
+		{
+			debugMsg(__CLASS__.'::_run() - Just finished');
+			// We just finished
+			$this->setState('postrun');
+		}
+		elseif( !empty($error) )
+		{
+			debugMsg(__CLASS__.'::_run() - Halted with an error:');
+			debugMsg($error);
+			$this->setState( 'error', $error );
+		}
+	}
+
+	protected function _finalize()
+	{
+		// Nothing to do
+		$this->setState('finished');
+	}
+
+	/**
+	 * Returns the base extension of the file, e.g. '.jpa'
+	 * @return string
+	 */
+	private function getBaseExtension()
+	{
+		static $baseextension;
+
+		if(empty($baseextension))
+		{
+			$basename = basename($this->filename);
+			$lastdot = strrpos($basename,'.');
+			$baseextension = substr($basename, $lastdot);
+		}
+
+		return $baseextension;
+	}
+
+	/**
+	 * Scans for archive parts
+	 */
+	private function scanArchives()
+	{
+		if(defined('KSDEBUG')) {
+			@unlink('debug.txt');
+		}
+		debugMsg('Preparing to scan archives');
+
+		$privateArchiveList = array();
+
+		// Get the components of the archive filename
+		$dirname = dirname($this->filename);
+		$base_extension = $this->getBaseExtension();
+		$basename = basename($this->filename, $base_extension);
+		$this->totalSize = 0;
+
+		// Scan for multiple parts until we don't find any more of them
+		$count = 0;
+		$found = true;
+		$this->archiveList = array();
+		while($found)
+		{
+			++$count;
+			$extension = substr($base_extension, 0, 2).sprintf('%02d', $count);
+			$filename = $dirname.DIRECTORY_SEPARATOR.$basename.$extension;
+			$found = file_exists($filename);
+			if($found)
+			{
+				debugMsg('- Found archive '.$filename);
+				// Add yet another part, with a numeric-appended filename
+				$this->archiveList[] = $filename;
+
+				$filesize = @filesize($filename);
+				$this->totalSize += $filesize;
+
+				$privateArchiveList[] = array($filename, $filesize);
+			}
+			else
+			{
+				debugMsg('- Found archive '.$this->filename);
+				// Add the last part, with the regular extension
+				$this->archiveList[] = $this->filename;
+
+				$filename = $this->filename;
+				$filesize = @filesize($filename);
+				$this->totalSize += $filesize;
+
+				$privateArchiveList[] = array($filename, $filesize);
+			}
+		}
+		debugMsg('Total archive parts: '.$count);
+
+		$this->currentPartNumber = -1;
+		$this->currentPartOffset = 0;
+		$this->runState = AK_STATE_NOFILE;
+
+		// Send start of file notification
+		$message = new stdClass;
+		$message->type = 'totalsize';
+		$message->content = new stdClass;
+		$message->content->totalsize = $this->totalSize;
+		$message->content->filelist = $privateArchiveList;
+		$this->notify($message);
+	}
+
+	/**
+	 * Opens the next part file for reading
+	 */
+	protected function nextFile()
+	{
+		debugMsg('Current part is '.$this->currentPartNumber.'; opening the next part');
+		++$this->currentPartNumber;
+
+		if( $this->currentPartNumber > (count($this->archiveList) - 1) )
+		{
+			$this->setState('postrun');
+			return false;
+		}
+		else
+		{
+			if( is_resource($this->fp) ) @fclose($this->fp);
+			debugMsg('Opening file '.$this->archiveList[$this->currentPartNumber]);
+			$this->fp = @fopen( $this->archiveList[$this->currentPartNumber], 'rb' );
+			if($this->fp === false) {
+				debugMsg('Could not open file - crash imminent');
+			}
+			fseek($this->fp, 0);
+			$this->currentPartOffset = 0;
+			return true;
+		}
+	}
+
+	/**
+	 * Returns true if we have reached the end of file
+	 * @param $local bool True to return EOF of the local file, false (default) to return if we have reached the end of the archive set
+	 * @return bool True if we have reached End Of File
+	 */
+	protected function isEOF($local = false)
+	{
+		$eof = @feof($this->fp);
+
+		if(!$eof)
+		{
+			// Border case: right at the part's end (eeeek!!!). For the life of me, I don't understand why
+			// feof() doesn't report true. It expects the fp to be positioned *beyond* the EOF to report
+			// true. Incredible! :(
+			$position = @ftell($this->fp);
+			$filesize = @filesize( $this->archiveList[$this->currentPartNumber] );
+			if($filesize <= 0) {
+				// 2Gb or more files on a 32 bit version of PHP tend to get screwed up. Meh.
+				$eof = false;
+			} elseif( $position >= $filesize  ) {
+				$eof = true;
+			}
+		}
+
+		if($local)
+		{
+			return $eof;
+		}
+		else
+		{
+			return $eof && ($this->currentPartNumber >= (count($this->archiveList)-1) );
+		}
+	}
+
+	/**
+	 * Tries to make a directory user-writable so that we can write a file to it
+	 * @param $path string A path to a file
+	 */
+	protected function setCorrectPermissions($path)
+	{
+		static $rootDir = null;
+
+		if(is_null($rootDir)) {
+			$rootDir = rtrim(AKFactory::get('kickstart.setup.destdir',''),'/\\');
+		}
+
+		$directory = rtrim(dirname($path),'/\\');
 		if($directory != $rootDir) {
 			// Is this an unwritable directory?
 			if(!is_writeable($directory)) {
@@ -1626,12 +2073,12 @@ protected function fread($fp, $length = null)
 			if($length > 0) {
 				$data = fread($fp, $length);
 			} else {
-				$data = fread($fp);
+				$data = fread($fp, PHP_INT_MAX);
 			}
 		}
 		else
 		{
-			$data = fread($fp);
+			$data = fread($fp, PHP_INT_MAX);
 		}
 		if($data === false) $data = '';
 
@@ -1644,514 +2091,1468 @@ protected function fread($fp, $length = null)
 
 		return $data;
 	}
-}
 
-/**
- * The superclass of all Akeeba Kickstart parts. The "parts" are intelligent stateful
- * classes which perform a single procedure and have preparation, running and
- * finalization phases. The transition between phases is handled automatically by
- * this superclass' tick() final public method, which should be the ONLY public API
- * exposed to the rest of the Akeeba Engine.
- */
-abstract class AKAbstractPart extends AKAbstractObject
-{
 	/**
-	 * Indicates whether this part has finished its initialisation cycle
-	 * @var boolean
+	 * Is this file or directory contained in a directory we've decided to ignore
+	 * write errors for? This is useful to let the extraction work despite write
+	 * errors in the log, logs and tmp directories which MIGHT be used by the system
+	 * on some low quality hosts and Plesk-powered hosts.
+	 *
+	 * @param   string  $shortFilename  The relative path of the file/directory in the package
+	 *
+	 * @return  boolean  True if it belongs in an ignored directory
 	 */
-	protected $isPrepared = false;
-
-	/**
-	 * Indicates whether this part has more work to do (it's in running state)
-	 * @var boolean
-	 */
-	protected $isRunning = false;
+	public function isIgnoredDirectory($shortFilename)
+	{
+		return false;
+		if (substr($shortFilename, -1) == '/')
+		{
+			$check = substr($shortFilename, 0, -1);
+		}
+		else
+		{
+			$check = dirname($shortFilename);
+		}
 
-	/**
-	 * Indicates whether this part has finished its finalization cycle
-	 * @var boolean
-	 */
-	protected $isFinished = false;
+		return in_array($check, $this->ignoreDirectories);
+	}
+}
 
-	/**
-	 * Indicates whether this part has finished its run cycle
-	 * @var boolean
-	 */
-	protected $hasRan = false;
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
 
-	/**
-	 * The name of the engine part (a.k.a. Domain), used in return table
-	 * generation.
-	 * @var string
-	 */
-	protected $active_domain = "";
+/**
+ * File post processor engines base class
+ */
+abstract class AKAbstractPostproc extends AKAbstractObject
+{
+	/** @var string The current (real) file path we'll have to process */
+	protected $filename = null;
+
+	/** @var int The requested permissions */
+	protected $perms = 0755;
+
+	/** @var string The temporary file path we gave to the unarchiver engine */
+	protected $tempFilename = null;
+
+	/** @var int The UNIX timestamp of the file's desired modification date */
+	public $timestamp = 0;
 
 	/**
-	 * The step this engine part is in. Used verbatim in return table and
-	 * should be set by the code in the _run() method.
-	 * @var string
+	 * Processes the current file, e.g. moves it from temp to final location by FTP
 	 */
-	protected $active_step = "";
+	abstract public function process();
 
 	/**
-	 * A more detailed description of the step this engine part is in. Used
-	 * verbatim in return table and should be set by the code in the _run()
-	 * method.
-	 * @var string
+	 * The unarchiver tells us the path to the filename it wants to extract and we give it
+	 * a different path instead.
+	 * @param string $filename The path to the real file
+	 * @param int $perms The permissions we need the file to have
+	 * @return string The path to the temporary file
 	 */
-	protected $active_substep = "";
+	abstract public function processFilename($filename, $perms = 0755);
 
 	/**
-	 * Any configuration variables, in the form of an array.
-	 * @var array
+	 * Recursively creates a directory if it doesn't exist
+	 * @param string $dirName The directory to create
+	 * @param int $perms The permissions to give to that directory
 	 */
-	protected $_parametersArray = array();
+	abstract public function createDirRecursive( $dirName, $perms );
+
+	abstract public function chmod( $file, $perms );
+
+	abstract public function unlink( $file );
+
+	abstract public function rmdir( $directory );
+
+	abstract public function rename( $from, $to );
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Descendants of this class can be used in the unarchiver's observer methods (attach, detach and notify)
+ * @author Nicholas
+ *
+ */
+abstract class AKAbstractPartObserver
+{
+	abstract public function update($object, $message);
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Direct file writer
+ */
+class AKPostprocDirect extends AKAbstractPostproc
+{
+	public function process()
+	{
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		if($restorePerms)
+		{
+			@chmod($this->filename, $this->perms);
+		}
+		else
+		{
+			if(@is_file($this->filename))
+			{
+				@chmod($this->filename, 0644);
+			}
+			else
+			{
+				@chmod($this->filename, 0755);
+			}
+		}
+		if($this->timestamp > 0)
+		{
+			@touch($this->filename, $this->timestamp);
+		}
+		return true;
+	}
+
+	public function processFilename($filename, $perms = 0755)
+	{
+		$this->perms = $perms;
+		$this->filename = $filename;
+		return $filename;
+	}
+
+	public function createDirRecursive( $dirName, $perms )
+	{
+		if( AKFactory::get('kickstart.setup.dryrun','0') ) return true;
+		if (@mkdir($dirName, 0755, true)) {
+			@chmod($dirName, 0755);
+			return true;
+		}
+
+		$root = AKFactory::get('kickstart.setup.destdir');
+		$root = rtrim(str_replace('\\','/',$root),'/');
+		$dir = rtrim(str_replace('\\','/',$dirName),'/');
+		if(strpos($dir, $root) === 0) {
+			$dir = ltrim(substr($dir, strlen($root)), '/');
+			$root .= '/';
+		} else {
+			$root = '';
+		}
+
+		if(empty($dir)) return true;
+
+		$dirArray = explode('/', $dir);
+		$path = '';
+		foreach( $dirArray as $dir )
+		{
+			$path .= $dir . '/';
+			$ret = is_dir($root.$path) ? true : @mkdir($root.$path);
+			if( !$ret ) {
+				// Is this a file instead of a directory?
+				if(is_file($root.$path) )
+				{
+					@unlink($root.$path);
+					$ret = @mkdir($root.$path);
+				}
+				if( !$ret ) {
+					$this->setError( AKText::sprintf('COULDNT_CREATE_DIR',$path) );
+					return false;
+				}
+			}
+			// Try to set new directory permissions to 0755
+			@chmod($root.$path, $perms);
+		}
+		return true;
+	}
+
+	public function chmod( $file, $perms )
+	{
+		if( AKFactory::get('kickstart.setup.dryrun','0') ) return true;
+
+		return @chmod( $file, $perms );
+	}
+
+	public function unlink( $file )
+	{
+		return @unlink( $file );
+	}
+
+	public function rmdir( $directory )
+	{
+		return @rmdir( $directory );
+	}
+
+	public function rename( $from, $to )
+	{
+		return @rename($from, $to);
+	}
+
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * FTP file writer
+ */
+class AKPostprocFTP extends AKAbstractPostproc
+{
+	/** @var bool Should I use FTP over implicit SSL? */
+	public $useSSL = false;
+	/** @var bool use Passive mode? */
+	public $passive = true;
+	/** @var string FTP host name */
+	public $host = '';
+	/** @var int FTP port */
+	public $port = 21;
+	/** @var string FTP user name */
+	public $user = '';
+	/** @var string FTP password */
+	public $pass = '';
+	/** @var string FTP initial directory */
+	public $dir = '';
+	/** @var resource The FTP handle */
+	private $handle = null;
+	/** @var string The temporary directory where the data will be stored */
+	private $tempDir = '';
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->useSSL = AKFactory::get('kickstart.ftp.ssl', false);
+		$this->passive = AKFactory::get('kickstart.ftp.passive', true);
+		$this->host = AKFactory::get('kickstart.ftp.host', '');
+		$this->port = AKFactory::get('kickstart.ftp.port', 21);
+		if(trim($this->port) == '') $this->port = 21;
+		$this->user = AKFactory::get('kickstart.ftp.user', '');
+		$this->pass = AKFactory::get('kickstart.ftp.pass', '');
+		$this->dir = AKFactory::get('kickstart.ftp.dir', '');
+		$this->tempDir = AKFactory::get('kickstart.ftp.tempdir', '');
+
+		$connected = $this->connect();
+
+		if($connected)
+		{
+			if(!empty($this->tempDir))
+			{
+				$tempDir = rtrim($this->tempDir, '/\\').'/';
+				$writable = $this->isDirWritable($tempDir);
+			}
+			else
+			{
+				$tempDir = '';
+				$writable = false;
+			}
+
+			if(!$writable) {
+				// Default temporary directory is the current root
+				$tempDir = KSROOTDIR;
+				if(empty($tempDir))
+				{
+					// Oh, we have no directory reported!
+					$tempDir = '.';
+				}
+				$absoluteDirToHere = $tempDir;
+				$tempDir = rtrim(str_replace('\\','/',$tempDir),'/');
+				if(!empty($tempDir)) $tempDir .= '/';
+				$this->tempDir = $tempDir;
+				// Is this directory writable?
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			if(!$writable)
+			{
+				// Nope. Let's try creating a temporary directory in the site's root.
+				$tempDir = $absoluteDirToHere.'/kicktemp';
+				$this->createDirRecursive($tempDir, 0777);
+				// Try making it writable...
+				$this->fixPermissions($tempDir);
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			// Was the new directory writable?
+			if(!$writable)
+			{
+				// Let's see if the user has specified one
+				$userdir = AKFactory::get('kickstart.ftp.tempdir', '');
+				if(!empty($userdir))
+				{
+					// Is it an absolute or a relative directory?
+					$absolute = false;
+					$absolute = $absolute || ( substr($userdir,0,1) == '/' );
+					$absolute = $absolute || ( substr($userdir,1,1) == ':' );
+					$absolute = $absolute || ( substr($userdir,2,1) == ':' );
+					if(!$absolute)
+					{
+						// Make absolute
+						$tempDir = $absoluteDirToHere.$userdir;
+					}
+					else
+					{
+						// it's already absolute
+						$tempDir = $userdir;
+					}
+					// Does the directory exist?
+					if( is_dir($tempDir) )
+					{
+						// Yeah. Is it writable?
+						$writable = $this->isDirWritable($tempDir);
+					}
+				}
+			}
+			$this->tempDir = $tempDir;
+
+			if(!$writable)
+			{
+				// No writable directory found!!!
+				$this->setError(AKText::_('FTP_TEMPDIR_NOT_WRITABLE'));
+			}
+			else
+			{
+				AKFactory::set('kickstart.ftp.tempdir', $tempDir);
+				$this->tempDir = $tempDir;
+			}
+		}
+	}
+
+	function __wakeup()
+	{
+		$this->connect();
+	}
+
+	public function connect()
+	{
+		// Connect to server, using SSL if so required
+		if($this->useSSL) {
+			$this->handle = @ftp_ssl_connect($this->host, $this->port);
+		} else {
+			$this->handle = @ftp_connect($this->host, $this->port);
+		}
+		if($this->handle === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_HOST'));
+			return false;
+		}
+
+		// Login
+		if(! @ftp_login($this->handle, $this->user, $this->pass))
+		{
+			$this->setError(AKText::_('WRONG_FTP_USER'));
+			@ftp_close($this->handle);
+			return false;
+		}
+
+		// Change to initial directory
+		if(! @ftp_chdir($this->handle, $this->dir))
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH1'));
+			@ftp_close($this->handle);
+			return false;
+		}
+
+		// Enable passive mode if the user requested it
+		if( $this->passive )
+		{
+			@ftp_pasv($this->handle, true);
+		}
+		else
+		{
+			@ftp_pasv($this->handle, false);
+		}
+
+		// Try to download ourselves
+		$testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
+		$tempHandle = fopen('php://temp', 'r+');
+		if (@ftp_fget($this->handle, $tempHandle, $testFilename, FTP_ASCII, 0) === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH2'));
+			@ftp_close($this->handle);
+			fclose($tempHandle);
+
+			return false;
+		}
+		fclose($tempHandle);
+
+		return true;
+	}
+
+	public function process()
+	{
+		if( is_null($this->tempFilename) )
+		{
+			// If an empty filename is passed, it means that we shouldn't do any post processing, i.e.
+			// the entity was a directory or symlink
+			return true;
+		}
+
+		$remotePath = dirname($this->filename);
+		$removePath = AKFactory::get('kickstart.setup.destdir','');
+		if(!empty($removePath))
+		{
+			$removePath = ltrim($removePath, "/");
+			$remotePath = ltrim($remotePath, "/");
+			$left = substr($remotePath, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$remotePath = substr($remotePath, strlen($removePath));
+			}
+		}
+
+		$absoluteFSPath = dirname($this->filename);
+		$relativeFTPPath = trim($remotePath, '/');
+		$absoluteFTPPath = '/'.trim( $this->dir, '/' ).'/'.trim($remotePath, '/');
+		$onlyFilename = basename($this->filename);
+
+		$remoteName = $absoluteFTPPath.'/'.$onlyFilename;
+
+		$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+		if($ret === false)
+		{
+			$ret = $this->createDirRecursive( $absoluteFSPath, 0755);
+			if($ret === false) {
+				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+				return false;
+			}
+			$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+			if($ret === false) {
+				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+				return false;
+			}
+		}
+
+		$ret = @ftp_put($this->handle, $remoteName, $this->tempFilename, FTP_BINARY);
+		if($ret === false)
+		{
+			// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
+			$this->fixPermissions($this->filename);
+			$this->unlink($this->filename);
+
+			$fp = @fopen($this->tempFilename, 'rb');
+			if($fp !== false)
+			{
+				$ret = @ftp_fput($this->handle, $remoteName, $fp, FTP_BINARY);
+				@fclose($fp);
+			}
+			else
+			{
+				$ret = false;
+			}
+		}
+		@unlink($this->tempFilename);
+
+		if($ret === false)
+		{
+			$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+			return false;
+		}
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		if($restorePerms)
+		{
+			@ftp_chmod($this->_handle, $this->perms, $remoteName);
+		}
+		else
+		{
+			@ftp_chmod($this->_handle, 0644, $remoteName);
+		}
+		return true;
+	}
+
+	public function processFilename($filename, $perms = 0755)
+	{
+		// Catch some error conditions...
+		if($this->getError())
+		{
+			return false;
+		}
+
+		// If a null filename is passed, it means that we shouldn't do any post processing, i.e.
+		// the entity was a directory or symlink
+		if(is_null($filename))
+		{
+			$this->filename = null;
+			$this->tempFilename = null;
+			return null;
+		}
+
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir','');
+		if(!empty($removePath))
+		{
+			$left = substr($filename, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$filename = substr($filename, strlen($removePath));
+			}
+		}
+
+		// Trim slash on the left
+		$filename = ltrim($filename, '/');
+
+		$this->filename = $filename;
+		$this->tempFilename = tempnam($this->tempDir, 'kickstart-');
+		$this->perms = $perms;
+
+		if( empty($this->tempFilename) )
+		{
+			// Oops! Let's try something different
+			$this->tempFilename = $this->tempDir.'/kickstart-'.time().'.dat';
+		}
+
+		return $this->tempFilename;
+	}
+
+	private function isDirWritable($dir)
+	{
+		$fp = @fopen($dir.'/kickstart.dat', 'wb');
+		if($fp === false)
+		{
+			return false;
+		}
+		else
+		{
+			@fclose($fp);
+			unlink($dir.'/kickstart.dat');
+			return true;
+		}
+	}
+
+	public function createDirRecursive( $dirName, $perms )
+	{
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir','');
+		if(!empty($removePath))
+		{
+			// UNIXize the paths
+			$removePath = str_replace('\\','/',$removePath);
+			$dirName = str_replace('\\','/',$dirName);
+			// Make sure they both end in a slash
+			$removePath = rtrim($removePath,'/\\').'/';
+			$dirName = rtrim($dirName,'/\\').'/';
+			// Process the path removal
+			$left = substr($dirName, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$dirName = substr($dirName, strlen($removePath));
+			}
+		}
+		if(empty($dirName)) $dirName = ''; // 'cause the substr() above may return FALSE.
+
+		$check = '/'.trim($this->dir,'/').'/'.trim($dirName, '/');
+		if($this->is_dir($check)) return true;
+
+		$alldirs = explode('/', $dirName);
+		$previousDir = '/'.trim($this->dir);
+		foreach($alldirs as $curdir)
+		{
+			$check = $previousDir.'/'.$curdir;
+			if(!$this->is_dir($check))
+			{
+				// Proactively try to delete a file by the same name
+				@ftp_delete($this->handle, $check);
+
+				if(@ftp_mkdir($this->handle, $check) === false)
+				{
+					// If we couldn't create the directory, attempt to fix the permissions in the PHP level and retry!
+					$this->fixPermissions($removePath.$check);
+					if(@ftp_mkdir($this->handle, $check) === false)
+					{
+						// Can we fall back to pure PHP mode, sire?
+						if(!@mkdir($check))
+						{
+							$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR', $check));
+							return false;
+						}
+						else
+						{
+							// Since the directory was built by PHP, change its permissions
+							@chmod($check, "0777");
+							return true;
+						}
+					}
+				}
+				@ftp_chmod($this->handle, $perms, $check);
+			}
+			$previousDir = $check;
+		}
+
+		return true;
+	}
+
+	public function close()
+	{
+		@ftp_close($this->handle);
+	}
+
+	/*
+	 * Tries to fix directory/file permissions in the PHP level, so that
+	 * the FTP operation doesn't fail.
+	 * @param $path string The full path to a directory or file
+	 */
+	private function fixPermissions( $path )
+	{
+		// Turn off error reporting
+		if(!defined('KSDEBUG')) {
+			$oldErrorReporting = @error_reporting(E_NONE);
+		}
+
+		// Get UNIX style paths
+		$relPath = str_replace('\\','/',$path);
+		$basePath = rtrim(str_replace('\\','/',KSROOTDIR),'/');
+		$basePath = rtrim($basePath,'/');
+		if(!empty($basePath)) $basePath .= '/';
+		// Remove the leading relative root
+		if( substr($relPath,0,strlen($basePath)) == $basePath )
+			$relPath = substr($relPath,strlen($basePath));
+		$dirArray = explode('/', $relPath);
+		$pathBuilt = rtrim($basePath,'/');
+		foreach( $dirArray as $dir )
+		{
+			if(empty($dir)) continue;
+			$oldPath = $pathBuilt;
+			$pathBuilt .= '/'.$dir;
+			if(is_dir($oldPath.$dir))
+			{
+				@chmod($oldPath.$dir, 0777);
+			}
+			else
+			{
+				if(@chmod($oldPath.$dir, 0777) === false)
+				{
+					@unlink($oldPath.$dir);
+				}
+			}
+		}
+
+		// Restore error reporting
+		if(!defined('KSDEBUG')) {
+			@error_reporting($oldErrorReporting);
+		}
+	}
+
+	public function chmod( $file, $perms )
+	{
+		return @ftp_chmod($this->handle, $perms, $file);
+	}
+
+	private function is_dir( $dir )
+	{
+		return @ftp_chdir( $this->handle, $dir );
+	}
+
+	public function unlink( $file )
+	{
+		$removePath = AKFactory::get('kickstart.setup.destdir','');
+		if(!empty($removePath))
+		{
+			$left = substr($file, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$file = substr($file, strlen($removePath));
+			}
+		}
+
+		$check = '/'.trim($this->dir,'/').'/'.trim($file, '/');
+
+		return @ftp_delete( $this->handle, $check );
+	}
+
+	public function rmdir( $directory )
+	{
+		$removePath = AKFactory::get('kickstart.setup.destdir','');
+		if(!empty($removePath))
+		{
+			$left = substr($directory, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$directory = substr($directory, strlen($removePath));
+			}
+		}
+
+		$check = '/'.trim($this->dir,'/').'/'.trim($directory, '/');
+
+		return @ftp_rmdir( $this->handle, $check );
+	}
+
+	public function rename( $from, $to )
+	{
+		$originalFrom = $from;
+		$originalTo = $to;
+
+		$removePath = AKFactory::get('kickstart.setup.destdir','');
+		if(!empty($removePath))
+		{
+			$left = substr($from, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$from = substr($from, strlen($removePath));
+			}
+		}
+		$from = '/'.trim($this->dir,'/').'/'.trim($from, '/');
+
+		if(!empty($removePath))
+		{
+			$left = substr($to, 0, strlen($removePath));
+			if($left == $removePath)
+			{
+				$to = substr($to, strlen($removePath));
+			}
+		}
+		$to = '/'.trim($this->dir,'/').'/'.trim($to, '/');
+
+		$result = @ftp_rename( $this->handle, $from, $to );
+		if($result !== true)
+		{
+			return @rename($from, $to);
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * FTP file writer
+ */
+class AKPostprocSFTP extends AKAbstractPostproc
+{
+	/** @var bool Should I use FTP over implicit SSL? */
+	public $useSSL = false;
+	/** @var bool use Passive mode? */
+	public $passive = true;
+	/** @var string FTP host name */
+	public $host = '';
+	/** @var int FTP port */
+	public $port = 21;
+	/** @var string FTP user name */
+	public $user = '';
+	/** @var string FTP password */
+	public $pass = '';
+	/** @var string FTP initial directory */
+	public $dir = '';
+
+    /** @var resource SFTP resource handle */
+	private $handle = null;
+
+    /** @var resource SSH2 connection resource handle */
+    private $_connection = null;
+
+    /** @var string Current remote directory, including the remote directory string */
+    private $_currentdir;
+
+	/** @var string The temporary directory where the data will be stored */
+	private $tempDir = '';
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->host     = AKFactory::get('kickstart.ftp.host', '');
+		$this->port     = AKFactory::get('kickstart.ftp.port', 22);
+
+		if(trim($this->port) == '') $this->port = 22;
+
+		$this->user     = AKFactory::get('kickstart.ftp.user', '');
+		$this->pass     = AKFactory::get('kickstart.ftp.pass', '');
+		$this->dir      = AKFactory::get('kickstart.ftp.dir', '');
+		$this->tempDir  = AKFactory::get('kickstart.ftp.tempdir', '');
+
+		$connected = $this->connect();
+
+		if($connected)
+		{
+			if(!empty($this->tempDir))
+			{
+				$tempDir = rtrim($this->tempDir, '/\\').'/';
+				$writable = $this->isDirWritable($tempDir);
+			}
+			else
+			{
+				$tempDir = '';
+				$writable = false;
+			}
+
+			if(!$writable) {
+				// Default temporary directory is the current root
+				$tempDir = KSROOTDIR;
+				if(empty($tempDir))
+				{
+					// Oh, we have no directory reported!
+					$tempDir = '.';
+				}
+				$absoluteDirToHere = $tempDir;
+				$tempDir = rtrim(str_replace('\\','/',$tempDir),'/');
+				if(!empty($tempDir)) $tempDir .= '/';
+				$this->tempDir = $tempDir;
+				// Is this directory writable?
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			if(!$writable)
+			{
+				// Nope. Let's try creating a temporary directory in the site's root.
+				$tempDir = $absoluteDirToHere.'/kicktemp';
+				$this->createDirRecursive($tempDir, 0777);
+				// Try making it writable...
+				$this->fixPermissions($tempDir);
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			// Was the new directory writable?
+			if(!$writable)
+			{
+				// Let's see if the user has specified one
+				$userdir = AKFactory::get('kickstart.ftp.tempdir', '');
+				if(!empty($userdir))
+				{
+					// Is it an absolute or a relative directory?
+					$absolute = false;
+					$absolute = $absolute || ( substr($userdir,0,1) == '/' );
+					$absolute = $absolute || ( substr($userdir,1,1) == ':' );
+					$absolute = $absolute || ( substr($userdir,2,1) == ':' );
+					if(!$absolute)
+					{
+						// Make absolute
+						$tempDir = $absoluteDirToHere.$userdir;
+					}
+					else
+					{
+						// it's already absolute
+						$tempDir = $userdir;
+					}
+					// Does the directory exist?
+					if( is_dir($tempDir) )
+					{
+						// Yeah. Is it writable?
+						$writable = $this->isDirWritable($tempDir);
+					}
+				}
+			}
+			$this->tempDir = $tempDir;
+
+			if(!$writable)
+			{
+				// No writable directory found!!!
+				$this->setError(AKText::_('SFTP_TEMPDIR_NOT_WRITABLE'));
+			}
+			else
+			{
+				AKFactory::set('kickstart.ftp.tempdir', $tempDir);
+				$this->tempDir = $tempDir;
+			}
+		}
+	}
+
+	function __wakeup()
+	{
+		$this->connect();
+	}
+
+	public function connect()
+	{
+        $this->_connection = false;
 
-	/** @var string The database root key */
-	protected $databaseRoot = array();
+        if(!function_exists('ssh2_connect'))
+        {
+            $this->setError(AKText::_('SFTP_NO_SSH2'));
+            return false;
+        }
 
-	/** @var int Last reported warnings's position in array */
-	private $warnings_pointer = -1;
+        $this->_connection = @ssh2_connect($this->host, $this->port);
 
-	/** @var array An array of observers */
-	protected $observers = array();
+        if (!@ssh2_auth_password($this->_connection, $this->user, $this->pass))
+        {
+            $this->setError(AKText::_('SFTP_WRONG_USER'));
 
-	/**
-	 * Runs the preparation for this part. Should set _isPrepared
-	 * to true
-	 */
-	abstract protected function _prepare();
+            $this->_connection = false;
 
-	/**
-	 * Runs the finalisation process for this part. Should set
-	 * _isFinished to true.
-	 */
-	abstract protected function _finalize();
+            return false;
+        }
 
-	/**
-	 * Runs the main functionality loop for this part. Upon calling,
-	 * should set the _isRunning to true. When it finished, should set
-	 * the _hasRan to true. If an error is encountered, setError should
-	 * be used.
-	 */
-	abstract protected function _run();
+        $this->handle = @ssh2_sftp($this->_connection);
 
-	/**
-	 * Sets the BREAKFLAG, which instructs this engine part that the current step must break immediately,
-	 * in fear of timing out.
-	 */
-	protected function setBreakFlag()
-	{
-		AKFactory::set('volatile.breakflag', true);
-	}
+        // I must have an absolute directory
+        if(!$this->dir)
+        {
+            $this->setError(AKText::_('SFTP_WRONG_STARTING_DIR'));
+            return false;
+        }
 
-	/**
-	 * Sets the engine part's internal state, in an easy to use manner
-	 *
-	 * @param	string	$state			One of init, prepared, running, postrun, finished, error
-	 * @param	string	$errorMessage	The reported error message, should the state be set to error
-	 */
-	protected function setState($state = 'init', $errorMessage='Invalid setState argument')
-	{
-		switch($state)
-		{
-			case 'init':
-				$this->isPrepared = false;
-				$this->isRunning  = false;
-				$this->isFinished = false;
-				$this->hasRun     = false;
-				break;
+        // Change to initial directory
+        if(!$this->sftp_chdir('/'))
+        {
+            $this->setError(AKText::_('SFTP_WRONG_STARTING_DIR'));
 
-			case 'prepared':
-				$this->isPrepared = true;
-				$this->isRunning  = false;
-				$this->isFinished = false;
-				$this->hasRun     = false;
-				break;
+            unset($this->_connection);
+            unset($this->handle);
 
-			case 'running':
-				$this->isPrepared = true;
-				$this->isRunning  = true;
-				$this->isFinished = false;
-				$this->hasRun     = false;
-				break;
+            return false;
+        }
 
-			case 'postrun':
-				$this->isPrepared = true;
-				$this->isRunning  = false;
-				$this->isFinished = false;
-				$this->hasRun     = true;
-				break;
+        // Try to download ourselves
+        $testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
+        $basePath     = '/'.trim($this->dir, '/');
 
-			case 'finished':
-				$this->isPrepared = true;
-				$this->isRunning  = false;
-				$this->isFinished = true;
-				$this->hasRun     = false;
-				break;
+        if(@fopen("ssh2.sftp://{$this->handle}$basePath/$testFilename",'r+') === false)
+        {
+            $this->setError(AKText::_('SFTP_WRONG_STARTING_DIR'));
 
-			case 'error':
-			default:
-				$this->setError($errorMessage);
-				break;
-		}
+            unset($this->_connection);
+            unset($this->handle);
+
+            return false;
+        }
+
+        return true;
 	}
 
-	/**
-	 * The public interface to an engine part. This method takes care for
-	 * calling the correct method in order to perform the initialisation -
-	 * run - finalisation cycle of operation and return a proper reponse array.
-	 * @return	array	A Reponse Array
-	 */
-	final public function tick()
+	public function process()
 	{
-		// Call the right action method, depending on engine part state
-		switch( $this->getState() )
+		if( is_null($this->tempFilename) )
 		{
-			case "init":
-				$this->_prepare();
-				break;
-			case "prepared":
-				$this->_run();
-				break;
-			case "running":
-				$this->_run();
-				break;
-			case "postrun":
-				$this->_finalize();
-				break;
+			// If an empty filename is passed, it means that we shouldn't do any post processing, i.e.
+			// the entity was a directory or symlink
+			return true;
 		}
 
-		// Send a Return Table back to the caller
-		$out = $this->_makeReturnTable();
-		return $out;
-	}
+		$remotePath      = dirname($this->filename);
+		$absoluteFSPath  = dirname($this->filename);
+		$absoluteFTPPath = '/'.trim( $this->dir, '/' ).'/'.trim($remotePath, '/');
+		$onlyFilename    = basename($this->filename);
 
-	/**
-	 * Returns a copy of the class's status array
-	 * @return array
-	 */
-	public function getStatusArray()
-	{
-		return $this->_makeReturnTable();
-	}
+		$remoteName = $absoluteFTPPath.'/'.$onlyFilename;
 
-	/**
-	 * Sends any kind of setup information to the engine part. Using this,
-	 * we avoid passing parameters to the constructor of the class. These
-	 * parameters should be passed as an indexed array and should be taken
-	 * into account during the preparation process only. This function will
-	 * set the error flag if it's called after the engine part is prepared.
-	 *
-	 * @param array $parametersArray The parameters to be passed to the
-	 * engine part.
-	 */
-	final public function setup( $parametersArray )
-	{
-		if( $this->isPrepared )
-		{
-			$this->setState('error', "Can't modify configuration after the preparation of " . $this->active_domain);
-		}
-		else
+        $ret = $this->sftp_chdir($absoluteFTPPath);
+
+		if($ret === false)
 		{
-			$this->_parametersArray = $parametersArray;
-			if(array_key_exists('root', $parametersArray))
-			{
-				$this->databaseRoot = $parametersArray['root'];
+			$ret = $this->createDirRecursive( $absoluteFSPath, 0755);
+
+			if($ret === false)
+            {
+				$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+				return false;
 			}
-		}
-	}
 
-	/**
-	 * Returns the state of this engine part.
-	 *
-	 * @return string The state of this engine part. It can be one of
-	 * error, init, prepared, running, postrun, finished.
-	 */
-	final public function getState()
-	{
-		if( $this->getError() )
-		{
-			return "error";
-		}
+			$ret = $this->sftp_chdir($absoluteFTPPath);
 
-		if( !($this->isPrepared) )
-		{
-			return "init";
+			if($ret === false)
+            {
+				$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+				return false;
+			}
 		}
 
-		if( !($this->isFinished) && !($this->isRunning) && !( $this->hasRun ) && ($this->isPrepared) )
+        // Create the file
+        $ret = $this->write($this->tempFilename, $remoteName);
+
+        // If I got a -1 it means that I wasn't able to open the file, so I have to stop here
+        if($ret === -1)
+        {
+            $this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+            return false;
+        }
+
+		if($ret === false)
 		{
-			return "prepared";
+			// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
+			$this->fixPermissions($this->filename);
+			$this->unlink($this->filename);
+
+            $ret = $this->write($this->tempFilename, $remoteName);
 		}
 
-		if ( !($this->isFinished) && $this->isRunning && !( $this->hasRun ) )
+		@unlink($this->tempFilename);
+
+		if($ret === false)
 		{
-			return "running";
+			$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+			return false;
 		}
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
 
-		if ( !($this->isFinished) && !($this->isRunning) && $this->hasRun )
+		if($restorePerms)
 		{
-			return "postrun";
+            $this->chmod($remoteName, $this->perms);
 		}
-
-		if ( $this->isFinished )
+		else
 		{
-			return "finished";
+            $this->chmod($remoteName, 0644);
 		}
+		return true;
 	}
 
-	/**
-	 * Constructs a Response Array based on the engine part's state.
-	 * @return array The Response Array for the current state
-	 */
-	final protected function _makeReturnTable()
+	public function processFilename($filename, $perms = 0755)
 	{
-		// Get a list of warnings
-		$warnings = $this->getWarnings();
-		// Report only new warnings if there is no warnings queue size
-		if( $this->_warnings_queue_size == 0 )
+		// Catch some error conditions...
+		if($this->getError())
 		{
-			if( ($this->warnings_pointer > 0) && ($this->warnings_pointer < (count($warnings)) ) )
-			{
-				$warnings = array_slice($warnings, $this->warnings_pointer + 1);
-				$this->warnings_pointer += count($warnings);
-			}
-			else
-			{
-				$this->warnings_pointer = count($warnings);
-			}
+			return false;
 		}
 
-		$out =  array(
-			'HasRun'	=> (!($this->isFinished)),
-			'Domain'	=> $this->active_domain,
-			'Step'		=> $this->active_step,
-			'Substep'	=> $this->active_substep,
-			'Error'		=> $this->getError(),
-			'Warnings'	=> $warnings
-		);
-
-		return $out;
-	}
+		// If a null filename is passed, it means that we shouldn't do any post processing, i.e.
+		// the entity was a directory or symlink
+		if(is_null($filename))
+		{
+			$this->filename = null;
+			$this->tempFilename = null;
+			return null;
+		}
 
-	final protected function setDomain($new_domain)
-	{
-		$this->active_domain = $new_domain;
-	}
+        // Strip absolute filesystem path to website's root
+        $removePath = AKFactory::get('kickstart.setup.destdir','');
+        if(!empty($removePath))
+        {
+            $left = substr($filename, 0, strlen($removePath));
+            if($left == $removePath)
+            {
+                $filename = substr($filename, strlen($removePath));
+            }
+        }
 
-	final public function getDomain()
-	{
-		return $this->active_domain;
-	}
+        // Trim slash on the left
+        $filename = ltrim($filename, '/');
 
-	final protected function setStep($new_step)
-	{
-		$this->active_step = $new_step;
-	}
+		$this->filename = $filename;
+		$this->tempFilename = tempnam($this->tempDir, 'kickstart-');
+		$this->perms = $perms;
 
-	final public function getStep()
-	{
-		return $this->active_step;
-	}
+		if( empty($this->tempFilename) )
+		{
+			// Oops! Let's try something different
+			$this->tempFilename = $this->tempDir.'/kickstart-'.time().'.dat';
+		}
 
-	final protected function setSubstep($new_substep)
-	{
-		$this->active_substep = $new_substep;
+		return $this->tempFilename;
 	}
 
-	final public function getSubstep()
+	private function isDirWritable($dir)
 	{
-		return $this->active_substep;
+		if(@fopen("ssh2.sftp://{$this->handle}$dir/kickstart.dat",'wb') === false)
+		{
+			return false;
+		}
+		else
+		{
+            @ssh2_sftp_unlink($this->handle, $dir.'/kickstart.dat');
+			return true;
+		}
 	}
 
-	/**
-	 * Attaches an observer object
-	 * @param AKAbstractPartObserver $obs
-	 */
-	function attach(AKAbstractPartObserver $obs) {
-        $this->observers["$obs"] = $obs;
-    }
+	public function createDirRecursive( $dirName, $perms )
+	{
+        // Strip absolute filesystem path to website's root
+        $removePath = AKFactory::get('kickstart.setup.destdir','');
+        if(!empty($removePath))
+        {
+            // UNIXize the paths
+            $removePath = str_replace('\\','/',$removePath);
+            $dirName = str_replace('\\','/',$dirName);
+            // Make sure they both end in a slash
+            $removePath = rtrim($removePath,'/\\').'/';
+            $dirName = rtrim($dirName,'/\\').'/';
+            // Process the path removal
+            $left = substr($dirName, 0, strlen($removePath));
+            if($left == $removePath)
+            {
+                $dirName = substr($dirName, strlen($removePath));
+            }
+        }
+        if(empty($dirName)) $dirName = ''; // 'cause the substr() above may return FALSE.
 
-	/**
-	 * Dettaches an observer object
-	 * @param AKAbstractPartObserver $obs
-	 */
-    function detach(AKAbstractPartObserver $obs) {
-        delete($this->observers["$obs"]);
-    }
+		$check = '/'.trim($this->dir,'/ ').'/'.trim($dirName, '/');
 
-    /**
-     * Notifies observers each time something interesting happened to the part
-     * @param mixed $message The event object
-     */
-	protected function notify($message) {
-        foreach ($this->observers as $obs) {
-            $obs->update($this, $message);
+		if($this->is_dir($check))
+        {
+            return true;
         }
-    }
-}
 
-/**
- * Descendants of this class can be used in the unarchiver's observer methods (attach, detach and notify)
- * @author Nicholas
- *
- */
-abstract class AKAbstractPartObserver
-{
-	abstract public function update($object, $message);
-}
+		$alldirs = explode('/', $dirName);
+		$previousDir = '/'.trim($this->dir, '/ ');
 
-/**
- * Direct file writer
- */
-class AKPostprocDirect extends AKAbstractPostproc
-{
-	public function process()
-	{
-		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
-		if($restorePerms)
-		{
-			@chmod($this->filename, $this->perms);
-		}
-		else
+		foreach($alldirs as $curdir)
 		{
-			if(@is_file($this->filename))
-			{
-				@chmod($this->filename, 0644);
-			}
-			else
+            if(!$curdir)
+            {
+                continue;
+            }
+
+			$check = $previousDir.'/'.$curdir;
+
+			if(!$this->is_dir($check))
 			{
-				@chmod($this->filename, 0755);
+				// Proactively try to delete a file by the same name
+                @ssh2_sftp_unlink($this->handle, $check);
+
+				if(@ssh2_sftp_mkdir($this->handle, $check) === false)
+				{
+					// If we couldn't create the directory, attempt to fix the permissions in the PHP level and retry!
+					$this->fixPermissions($check);
+
+					if(@ssh2_sftp_mkdir($this->handle, $check) === false)
+					{
+						// Can we fall back to pure PHP mode, sire?
+						if(!@mkdir($check))
+						{
+							$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR', $check));
+							return false;
+						}
+						else
+						{
+							// Since the directory was built by PHP, change its permissions
+							@chmod($check, "0777");
+							return true;
+						}
+					}
+				}
+
+				@ssh2_sftp_chmod($this->handle, $check, $perms);
 			}
+
+			$previousDir = $check;
 		}
-		if($this->timestamp > 0)
-		{
-			@touch($this->filename, $this->timestamp);
-		}
+
 		return true;
 	}
 
-	public function processFilename($filename, $perms = 0755)
+	public function close()
 	{
-		$this->perms = $perms;
-		$this->filename = $filename;
-		return $filename;
+		unset($this->_connection);
+		unset($this->handle);
 	}
 
-	public function createDirRecursive( $dirName, $perms )
+	/*
+	 * Tries to fix directory/file permissions in the PHP level, so that
+	 * the FTP operation doesn't fail.
+	 * @param $path string The full path to a directory or file
+	 */
+	private function fixPermissions( $path )
 	{
-		if( AKFactory::get('kickstart.setup.dryrun','0') ) return true;
-		if (@mkdir($dirName, 0755, true)) {
-			@chmod($dirName, 0755);
-			return true;
+		// Turn off error reporting
+		if(!defined('KSDEBUG')) {
+			$oldErrorReporting = @error_reporting(E_NONE);
 		}
 
-		$root = AKFactory::get('kickstart.setup.destdir');
-		$root = rtrim(str_replace('\\','/',$root),'/');
-		$dir = rtrim(str_replace('\\','/',$dirName),'/');
-		if(strpos($dir, $root) === 0) {
-			$dir = ltrim(substr($dir, strlen($root)), '/');
-			$root .= '/';
-		} else {
-			$root = '';
-		}
-		
-		if(empty($dir)) return true;
+		// Get UNIX style paths
+		$relPath  = str_replace('\\','/',$path);
+		$basePath = rtrim(str_replace('\\','/',KSROOTDIR),'/');
+		$basePath = rtrim($basePath,'/');
+
+		if(!empty($basePath))
+        {
+            $basePath .= '/';
+        }
+
+		// Remove the leading relative root
+		if( substr($relPath,0,strlen($basePath)) == $basePath )
+        {
+            $relPath = substr($relPath,strlen($basePath));
+        }
+
+		$dirArray  = explode('/', $relPath);
+		$pathBuilt = rtrim($basePath,'/');
 
-		$dirArray = explode('/', $dir);
-		$path = '';
 		foreach( $dirArray as $dir )
 		{
-			$path .= $dir . '/';
-			$ret = is_dir($root.$path) ? true : @mkdir($root.$path);
-			if( !$ret ) {
-				// Is this a file instead of a directory?
-				if(is_file($root.$path) )
+			if(empty($dir))
+            {
+                continue;
+            }
+
+			$oldPath = $pathBuilt;
+			$pathBuilt .= '/'.$dir;
+
+			if(is_dir($oldPath.'/'.$dir))
+			{
+				@chmod($oldPath.'/'.$dir, 0777);
+			}
+			else
+			{
+				if(@chmod($oldPath.'/'.$dir, 0777) === false)
 				{
-					@unlink($root.$path);
-					$ret = @mkdir($root.$path);
-				}
-				if( !$ret ) {
-					$this->setError( AKText::sprintf('COULDNT_CREATE_DIR',$path) );
-					return false;
+					@unlink($oldPath.$dir);
 				}
 			}
-			// Try to set new directory permissions to 0755
-			@chmod($root.$path, $perms);
 		}
-		return true;
+
+		// Restore error reporting
+		if(!defined('KSDEBUG')) {
+			@error_reporting($oldErrorReporting);
+		}
 	}
 
 	public function chmod( $file, $perms )
 	{
-		if( AKFactory::get('kickstart.setup.dryrun','0') ) return true;
+        return @ssh2_sftp_chmod($this->handle, $file, $perms);
+	}
 
-		return @chmod( $file, $perms );
+	private function is_dir( $dir )
+	{
+        return $this->sftp_chdir($dir);
 	}
 
+    private function write($local, $remote)
+    {
+        $fp      = @fopen("ssh2.sftp://{$this->handle}$remote",'w');
+        $localfp = @fopen($local,'rb');
+
+        if($fp === false)
+        {
+            return -1;
+        }
+
+        if($localfp === false)
+        {
+            @fclose($fp);
+            return -1;
+        }
+
+        $res = true;
+
+        while(!feof($localfp) && ($res !== false))
+        {
+            $buffer = @fread($localfp, 65567);
+            $res    = @fwrite($fp, $buffer);
+        }
+
+        @fclose($fp);
+        @fclose($localfp);
+
+        return $res;
+    }
+
 	public function unlink( $file )
 	{
-		return @unlink( $file );
+		$check    = '/'.trim($this->dir,'/').'/'.trim($file, '/');
+
+        return @ssh2_sftp_unlink($this->handle, $check);
 	}
 
 	public function rmdir( $directory )
 	{
-		return @rmdir( $directory );
+		$check    = '/'.trim($this->dir,'/').'/'.trim($directory, '/');
+
+		return @ssh2_sftp_rmdir( $this->handle, $check);
 	}
 
 	public function rename( $from, $to )
 	{
-		return @rename($from, $to);
+        $from     = '/'.trim($this->dir,'/').'/'.trim($from, '/');
+        $to       = '/'.trim($this->dir,'/').'/'.trim($to, '/');
+
+        $result =  @ssh2_sftp_rename($this->handle, $from, $to);
+
+		if($result !== true)
+		{
+			return @rename($from, $to);
+		}
+		else
+		{
+			return true;
+		}
 	}
 
+    /**
+     * Changes to the requested directory in the remote server. You give only the
+     * path relative to the initial directory and it does all the rest by itself,
+     * including doing nothing if the remote directory is the one we want.
+     *
+     * @param   string  $dir    The (realtive) remote directory
+     *
+     * @return  bool True if successful, false otherwise.
+     */
+    private function sftp_chdir($dir)
+    {
+        // Strip absolute filesystem path to website's root
+        $removePath = AKFactory::get('kickstart.setup.destdir','');
+        if(!empty($removePath))
+        {
+            // UNIXize the paths
+            $removePath = str_replace('\\','/',$removePath);
+            $dir        = str_replace('\\','/',$dir);
+
+            // Make sure they both end in a slash
+            $removePath = rtrim($removePath,'/\\').'/';
+            $dir        = rtrim($dir,'/\\').'/';
+
+            // Process the path removal
+            $left = substr($dir, 0, strlen($removePath));
+
+            if($left == $removePath)
+            {
+                $dir = substr($dir, strlen($removePath));
+            }
+        }
+
+        if(empty($dir))
+        {
+            // Because the substr() above may return FALSE.
+            $dir = '';
+        }
+
+        // Calculate "real" (absolute) SFTP path
+        $realdir = substr($this->dir, -1) == '/' ? substr($this->dir, 0, strlen($this->dir) - 1) : $this->dir;
+        $realdir .= '/'.$dir;
+        $realdir = substr($realdir, 0, 1) == '/' ? $realdir : '/'.$realdir;
+
+        if($this->_currentdir == $realdir)
+        {
+            // Already there, do nothing
+            return true;
+        }
+
+        $result = @ssh2_sftp_stat($this->handle, $realdir);
+
+        if($result === false)
+        {
+            return false;
+        }
+        else
+        {
+            // Update the private "current remote directory" variable
+            $this->_currentdir = $realdir;
+
+            return true;
+        }
+    }
+
 }
 
+
 /**
- * FTP file writer
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
  */
-class AKPostprocFTP extends AKAbstractPostproc
+
+/**
+ * Hybrid direct / FTP mode file writer
+ */
+class AKPostprocHybrid extends AKAbstractPostproc
 {
+
+	/** @var bool Should I use the FTP layer? */
+	public $useFTP = false;
+
 	/** @var bool Should I use FTP over implicit SSL? */
 	public $useSSL = false;
+
 	/** @var bool use Passive mode? */
 	public $passive = true;
+
 	/** @var string FTP host name */
 	public $host = '';
+
 	/** @var int FTP port */
 	public $port = 21;
+
 	/** @var string FTP user name */
 	public $user = '';
+
 	/** @var string FTP password */
 	public $pass = '';
+
 	/** @var string FTP initial directory */
 	public $dir = '';
+
 	/** @var resource The FTP handle */
 	private $handle = null;
+
 	/** @var string The temporary directory where the data will be stored */
 	private $tempDir = '';
 
+	/** @var null The FTP connection handle */
+	private $_handle = null;
+
+	/**
+	 * Public constructor. Tries to connect to the FTP server.
+	 */
 	public function __construct()
 	{
 		parent::__construct();
 
+		$this->useFTP = true;
 		$this->useSSL = AKFactory::get('kickstart.ftp.ssl', false);
 		$this->passive = AKFactory::get('kickstart.ftp.passive', true);
 		$this->host = AKFactory::get('kickstart.ftp.host', '');
 		$this->port = AKFactory::get('kickstart.ftp.port', 21);
-		if(trim($this->port) == '') $this->port = 21;
 		$this->user = AKFactory::get('kickstart.ftp.user', '');
 		$this->pass = AKFactory::get('kickstart.ftp.pass', '');
 		$this->dir = AKFactory::get('kickstart.ftp.dir', '');
 		$this->tempDir = AKFactory::get('kickstart.ftp.tempdir', '');
 
+		if (trim($this->port) == '')
+		{
+			$this->port = 21;
+		}
+
+		// If FTP is not configured, skip it altogether
+		if (empty($this->host) || empty($this->user) || empty($this->pass))
+		{
+			$this->useFTP = false;
+		}
+
+		// Try to connect to the FTP server
 		$connected = $this->connect();
 
-		if($connected)
+		// If the connection fails, skip FTP altogether
+		if (!$connected)
 		{
-			if(!empty($this->tempDir))
+			$this->useFTP = false;
+		}
+
+		if ($connected)
+		{
+			if (!empty($this->tempDir))
 			{
-				$tempDir = rtrim($this->tempDir, '/\\').'/';
+				$tempDir = rtrim($this->tempDir, '/\\') . '/';
 				$writable = $this->isDirWritable($tempDir);
 			}
 			else
@@ -2160,26 +3561,30 @@ public function __construct()
 				$writable = false;
 			}
 
-			if(!$writable) {
+			if (!$writable)
+			{
 				// Default temporary directory is the current root
-				$tempDir = function_exists('getcwd') ? getcwd() : dirname(__FILE__);
-				if(empty($tempDir))
+				$tempDir = KSROOTDIR;
+				if (empty($tempDir))
 				{
 					// Oh, we have no directory reported!
 					$tempDir = '.';
 				}
 				$absoluteDirToHere = $tempDir;
-				$tempDir = rtrim(str_replace('\\','/',$tempDir),'/');
-				if(!empty($tempDir)) $tempDir .= '/';
+				$tempDir = rtrim(str_replace('\\', '/', $tempDir), '/');
+				if (!empty($tempDir))
+				{
+					$tempDir .= '/';
+				}
 				$this->tempDir = $tempDir;
 				// Is this directory writable?
 				$writable = $this->isDirWritable($tempDir);
 			}
 
-			if(!$writable)
+			if (!$writable)
 			{
 				// Nope. Let's try creating a temporary directory in the site's root.
-				$tempDir = $absoluteDirToHere.'/kicktemp';
+				$tempDir = $absoluteDirToHere . '/kicktemp';
 				$this->createDirRecursive($tempDir, 0777);
 				// Try making it writable...
 				$this->fixPermissions($tempDir);
@@ -2187,21 +3592,21 @@ public function __construct()
 			}
 
 			// Was the new directory writable?
-			if(!$writable)
+			if (!$writable)
 			{
 				// Let's see if the user has specified one
 				$userdir = AKFactory::get('kickstart.ftp.tempdir', '');
-				if(!empty($userdir))
+				if (!empty($userdir))
 				{
 					// Is it an absolute or a relative directory?
 					$absolute = false;
-					$absolute = $absolute || ( substr($userdir,0,1) == '/' );
-					$absolute = $absolute || ( substr($userdir,1,1) == ':' );
-					$absolute = $absolute || ( substr($userdir,2,1) == ':' );
-					if(!$absolute)
+					$absolute = $absolute || (substr($userdir, 0, 1) == '/');
+					$absolute = $absolute || (substr($userdir, 1, 1) == ':');
+					$absolute = $absolute || (substr($userdir, 2, 1) == ':');
+					if (!$absolute)
 					{
 						// Make absolute
-						$tempDir = $absoluteDirToHere.$userdir;
+						$tempDir = $absoluteDirToHere . $userdir;
 					}
 					else
 					{
@@ -2209,7 +3614,7 @@ public function __construct()
 						$tempDir = $userdir;
 					}
 					// Does the directory exist?
-					if( is_dir($tempDir) )
+					if (is_dir($tempDir))
 					{
 						// Yeah. Is it writable?
 						$writable = $this->isDirWritable($tempDir);
@@ -2218,7 +3623,7 @@ public function __construct()
 			}
 			$this->tempDir = $tempDir;
 
-			if(!$writable)
+			if (!$writable)
 			{
 				// No writable directory found!!!
 				$this->setError(AKText::_('FTP_TEMPDIR_NOT_WRITABLE'));
@@ -2231,43 +3636,73 @@ public function __construct()
 		}
 	}
 
+	/**
+	 * Called after unserialisation, tries to reconnect to FTP
+	 */
 	function __wakeup()
 	{
-		$this->connect();
+		if ($this->useFTP)
+		{
+			$this->connect();
+		}
+	}
+
+	function __destruct()
+	{
+		if (!$this->useFTP)
+		{
+			@ftp_close($this->handle);
+		}
 	}
 
+	/**
+	 * Tries to connect to the FTP server
+	 *
+	 * @return bool
+	 */
 	public function connect()
 	{
+		if (!$this->useFTP)
+		{
+			return false;
+		}
+
 		// Connect to server, using SSL if so required
-		if($this->useSSL) {
+		if ($this->useSSL)
+		{
 			$this->handle = @ftp_ssl_connect($this->host, $this->port);
-		} else {
+		}
+		else
+		{
 			$this->handle = @ftp_connect($this->host, $this->port);
 		}
-		if($this->handle === false)
+		if ($this->handle === false)
 		{
 			$this->setError(AKText::_('WRONG_FTP_HOST'));
+
 			return false;
 		}
 
 		// Login
-		if(! @ftp_login($this->handle, $this->user, $this->pass))
+		if (!@ftp_login($this->handle, $this->user, $this->pass))
 		{
 			$this->setError(AKText::_('WRONG_FTP_USER'));
 			@ftp_close($this->handle);
+
 			return false;
 		}
 
 		// Change to initial directory
-		if(! @ftp_chdir($this->handle, $this->dir))
+		if (!@ftp_chdir($this->handle, $this->dir))
 		{
 			$this->setError(AKText::_('WRONG_FTP_PATH1'));
 			@ftp_close($this->handle);
+
 			return false;
 		}
 
 		// Enable passive mode if the user requested it
-		if( $this->passive )
+		if ($this->passive)
 		{
 			@ftp_pasv($this->handle, true);
 		}
@@ -2276,12 +3711,32 @@ public function connect()
 			@ftp_pasv($this->handle, false);
 		}
 
+		// Try to download ourselves
+		$testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
+		$tempHandle = fopen('php://temp', 'r+');
+
+		if (@ftp_fget($this->handle, $tempHandle, $testFilename, FTP_ASCII, 0) === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH2'));
+			@ftp_close($this->handle);
+			fclose($tempHandle);
+
+			return false;
+		}
+
+		fclose($tempHandle);
+
 		return true;
 	}
 
+	/**
+	 * Post-process an extracted file, using FTP or direct file writes to move it
+	 *
+	 * @return bool
+	 */
 	public function process()
 	{
-		if( is_null($this->tempFilename) )
+		if (is_null($this->tempFilename))
 		{
 			// If an empty filename is passed, it means that we shouldn't do any post processing, i.e.
 			// the entity was a directory or symlink
@@ -2289,13 +3744,16 @@ public function process()
 		}
 
 		$remotePath = dirname($this->filename);
-		$removePath = AKFactory::get('kickstart.setup.destdir','');
-		if(!empty($removePath))
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		$root = rtrim($removePath, '/\\');
+
+		if (!empty($removePath))
 		{
 			$removePath = ltrim($removePath, "/");
 			$remotePath = ltrim($remotePath, "/");
 			$left = substr($remotePath, 0, strlen($removePath));
-			if($left == $removePath)
+
+			if ($left == $removePath)
 			{
 				$remotePath = substr($remotePath, strlen($removePath));
 			}
@@ -2303,86 +3761,124 @@ public function process()
 
 		$absoluteFSPath = dirname($this->filename);
 		$relativeFTPPath = trim($remotePath, '/');
-		$absoluteFTPPath = '/'.trim( $this->dir, '/' ).'/'.trim($remotePath, '/');
+		$absoluteFTPPath = '/' . trim($this->dir, '/') . '/' . trim($remotePath, '/');
 		$onlyFilename = basename($this->filename);
 
-		$remoteName = $absoluteFTPPath.'/'.$onlyFilename;
+		$remoteName = $absoluteFTPPath . '/' . $onlyFilename;
 
-		$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
-		if($ret === false)
+		// Does the directory exist?
+		if (!is_dir($root . '/' . $absoluteFSPath))
 		{
-			$ret = $this->createDirRecursive( $absoluteFSPath, 0755);
-			if($ret === false) {
-				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
-				return false;
+			$ret = $this->createDirRecursive($absoluteFSPath, 0755);
+
+			if (($ret === false) && ($this->useFTP))
+			{
+				$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
 			}
-			$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
-			if($ret === false) {
+
+			if ($ret === false)
+			{
 				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
 				return false;
 			}
 		}
 
-		$ret = @ftp_put($this->handle, $remoteName, $this->tempFilename, FTP_BINARY);
-		if($ret === false)
+		if ($this->useFTP)
+		{
+			$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+		}
+
+		// Try copying directly
+		$ret = @copy($this->tempFilename, $root . '/' . $this->filename);
+
+		if ($ret === false)
 		{
-			// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
 			$this->fixPermissions($this->filename);
 			$this->unlink($this->filename);
 
-			$fp = @fopen($this->tempFilename);
-			if($fp !== false)
-			{
-				$ret = @ftp_fput($this->handle, $remoteName, $fp, FTP_BINARY);
-				@fclose($fp);
-			}
-			else
+			$ret = @copy($this->tempFilename, $root . '/' . $this->filename);
+		}
+
+		if ($this->useFTP && ($ret === false))
+		{
+			$ret = @ftp_put($this->handle, $remoteName, $this->tempFilename, FTP_BINARY);
+
+			if ($ret === false)
 			{
-				$ret = false;
+				// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
+				$this->fixPermissions($this->filename);
+				$this->unlink($this->filename);
+
+				$fp = @fopen($this->tempFilename, 'rb');
+				if ($fp !== false)
+				{
+					$ret = @ftp_fput($this->handle, $remoteName, $fp, FTP_BINARY);
+					@fclose($fp);
+				}
+				else
+				{
+					$ret = false;
+				}
 			}
 		}
+
 		@unlink($this->tempFilename);
 
-		if($ret === false)
+		if ($ret === false)
 		{
 			$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
 			return false;
 		}
+
 		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
-		if($restorePerms)
+		$perms = $restorePerms ? $this->perms : 0644;
+
+		$ret = @chmod($root . '/' . $this->filename, $perms);
+
+		if ($this->useFTP && ($ret === false))
 		{
 			@ftp_chmod($this->_handle, $perms, $remoteName);
 		}
-		else
-		{
-			@ftp_chmod($this->_handle, 0644, $remoteName);
-		}
+
 		return true;
 	}
 
+	/**
+	 * Create a temporary filename
+	 *
+	 * @param string $filename The original filename
+	 * @param int    $perms    The file permissions
+	 *
+	 * @return string
+	 */
 	public function processFilename($filename, $perms = 0755)
 	{
 		// Catch some error conditions...
-		if($this->getError())
+		if ($this->getError())
 		{
 			return false;
 		}
 
 		// If a null filename is passed, it means that we shouldn't do any post processing, i.e.
 		// the entity was a directory or symlink
-		if(is_null($filename))
+		if (is_null($filename))
 		{
 			$this->filename = null;
 			$this->tempFilename = null;
+
 			return null;
 		}
 
 		// Strip absolute filesystem path to website's root
-		$removePath = AKFactory::get('kickstart.setup.destdir','');
-		if(!empty($removePath))
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+
+		if (!empty($removePath))
 		{
 			$left = substr($filename, 0, strlen($removePath));
-			if($left == $removePath)
+
+			if ($left == $removePath)
 			{
 				$filename = substr($filename, strlen($removePath));
 			}
@@ -2395,243 +3891,371 @@ public function processFilename($filename, $perms = 0755)
 		$this->tempFilename = tempnam($this->tempDir, 'kickstart-');
 		$this->perms = $perms;
 
-		if( empty($this->tempFilename) )
+		if (empty($this->tempFilename))
 		{
 			// Oops! Let's try something different
-			$this->tempFilename = $this->tempDir.'/kickstart-'.time().'.dat';
+			$this->tempFilename = $this->tempDir . '/kickstart-' . time() . '.dat';
 		}
 
 		return $this->tempFilename;
 	}
 
+	/**
+	 * Is the directory writeable?
+	 *
+	 * @param string $dir The directory ti check
+	 *
+	 * @return bool
+	 */
 	private function isDirWritable($dir)
 	{
-		$fp = @fopen($dir.'/kickstart.dat', 'wb');
-		if($fp === false)
+		$fp = @fopen($dir . '/kickstart.dat', 'wb');
+
+		if ($fp === false)
 		{
 			return false;
 		}
-		else
-		{
-			@fclose($fp);
-			unlink($dir.'/kickstart.dat');
-			return true;
-		}
+
+		@fclose($fp);
+		unlink($dir . '/kickstart.dat');
+
+		return true;
 	}
 
-	public function createDirRecursive( $dirName, $perms )
+	/**
+	 * Create a directory, recursively
+	 *
+	 * @param string $dirName The directory to create
+	 * @param int    $perms   The permissions to give to the directory
+	 *
+	 * @return bool
+	 */
+	public function createDirRecursive($dirName, $perms)
 	{
 		// Strip absolute filesystem path to website's root
-		$removePath = AKFactory::get('kickstart.setup.destdir','');
-		if(!empty($removePath))
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+
+		if (!empty($removePath))
 		{
 			// UNIXize the paths
-			$removePath = str_replace('\\','/',$removePath);
-			$dirName = str_replace('\\','/',$dirName);
+			$removePath = str_replace('\\', '/', $removePath);
+			$dirName = str_replace('\\', '/', $dirName);
 			// Make sure they both end in a slash
-			$removePath = rtrim($removePath,'/\\').'/';
-			$dirName = rtrim($dirName,'/\\').'/';
+			$removePath = rtrim($removePath, '/\\') . '/';
+			$dirName = rtrim($dirName, '/\\') . '/';
 			// Process the path removal
 			$left = substr($dirName, 0, strlen($removePath));
-			if($left == $removePath)
+
+			if ($left == $removePath)
 			{
 				$dirName = substr($dirName, strlen($removePath));
 			}
 		}
-		if(empty($dirName)) $dirName = ''; // 'cause the substr() above may return FALSE.
-		
-		$check = '/'.trim($this->dir,'/').'/'.trim($dirName, '/');
-		if($this->is_dir($check)) return true;
+
+		// 'cause the substr() above may return FALSE.
+		if (empty($dirName))
+		{
+			$dirName = '';
+		}
+
+		$check = '/' . trim($this->dir, '/') . '/' . trim($dirName, '/');
+		$checkFS = $removePath . trim($dirName, '/');
+
+		if ($this->is_dir($check))
+		{
+			return true;
+		}
 
 		$alldirs = explode('/', $dirName);
-		$previousDir = '/'.trim($this->dir);
-		foreach($alldirs as $curdir)
+		$previousDir = '/' . trim($this->dir);
+		$previousDirFS = rtrim($removePath, '/\\');
+
+		foreach ($alldirs as $curdir)
 		{
-			$check = $previousDir.'/'.$curdir;
-			if(!$this->is_dir($check))
+			$check = $previousDir . '/' . $curdir;
+			$checkFS = $previousDirFS . '/' . $curdir;
+
+			if (!is_dir($checkFS) && !$this->is_dir($check))
 			{
 				// Proactively try to delete a file by the same name
-				@ftp_delete($this->handle, $check);
+				if (!@unlink($checkFS) && $this->useFTP)
+				{
+					@ftp_delete($this->handle, $check);
+				}
 
-				if(@ftp_mkdir($this->handle, $check) === false)
+				$createdDir = @mkdir($checkFS, 0755);
+
+				if (!$createdDir && $this->useFTP)
+				{
+					$createdDir = @ftp_mkdir($this->handle, $check);
+				}
+
+				if ($createdDir === false)
 				{
 					// If we couldn't create the directory, attempt to fix the permissions in the PHP level and retry!
-					$this->fixPermissions($removePath.$check);
-					if(@ftp_mkdir($this->handle, $check) === false)
+					$this->fixPermissions($checkFS);
+
+					$createdDir = @mkdir($checkFS, 0755);
+					if (!$createdDir && $this->useFTP)
 					{
-						// Can we fall back to pure PHP mode, sire?
-						if(!@mkdir($check))
-						{
-							$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR',$dir));
-							return false;
-						}
-						else
-						{
-							// Since the directory was built by PHP, change its permissions
-							@chmod($check, "0777");
-							return true;
-						}
+						$createdDir = @ftp_mkdir($this->handle, $check);
+					}
+
+					if ($createdDir === false)
+					{
+						$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR', $check));
+
+						return false;
 					}
 				}
-				@ftp_chmod($this->handle, $perms, $check);
+
+				if (!@chmod($checkFS, $perms) && $this->useFTP)
+				{
+					@ftp_chmod($this->handle, $perms, $check);
+				}
 			}
+
 			$previousDir = $check;
+			$previousDirFS = $checkFS;
 		}
 
 		return true;
 	}
 
+	/**
+	 * Closes the FTP connection
+	 */
 	public function close()
 	{
-		@ftp_close($this->handle);
+		if (!$this->useFTP)
+		{
+			@ftp_close($this->handle);
+		}
 	}
 
-	/*
+	/**
 	 * Tries to fix directory/file permissions in the PHP level, so that
 	 * the FTP operation doesn't fail.
+	 *
 	 * @param $path string The full path to a directory or file
 	 */
-	private function fixPermissions( $path )
+	private function fixPermissions($path)
 	{
 		// Turn off error reporting
-		if(!defined('KSDEBUG')) {
+		if (!defined('KSDEBUG'))
+		{
 			$oldErrorReporting = @error_reporting(E_NONE);
 		}
 
-		// Get UNIX style paths
-		$relPath = str_replace('\\','/',$path);
-		$basePath = rtrim(str_replace('\\','/',dirname(__FILE__)),'/');
-		$basePath = rtrim($basePath,'/');
-		if(!empty($basePath)) $basePath .= '/';
+		// Get UNIX style paths
+		$relPath = str_replace('\\', '/', $path);
+		$basePath = rtrim(str_replace('\\', '/', KSROOTDIR), '/');
+		$basePath = rtrim($basePath, '/');
+
+		if (!empty($basePath))
+		{
+			$basePath .= '/';
+		}
+
 		// Remove the leading relative root
-		if( substr($relPath,0,strlen($basePath)) == $basePath )
-			$relPath = substr($relPath,strlen($basePath));
+		if (substr($relPath, 0, strlen($basePath)) == $basePath)
+		{
+			$relPath = substr($relPath, strlen($basePath));
+		}
+
 		$dirArray = explode('/', $relPath);
-		$pathBuilt = rtrim($basePath,'/');
-		foreach( $dirArray as $dir )
+		$pathBuilt = rtrim($basePath, '/');
+
+		foreach ($dirArray as $dir)
 		{
-			if(empty($dir)) continue;
+			if (empty($dir))
+			{
+				continue;
+			}
+
 			$oldPath = $pathBuilt;
-			$pathBuilt .= '/'.$dir;
-			if(is_dir($oldPath.$dir))
+			$pathBuilt .= '/' . $dir;
+
+			if (is_dir($oldPath . $dir))
 			{
-				@chmod($oldPath.$dir, 0777);
+				@chmod($oldPath . $dir, 0777);
 			}
 			else
 			{
-				if(@chmod($oldPath.$dir, 0777) === false)
+				if (@chmod($oldPath . $dir, 0777) === false)
 				{
-					@unlink($oldPath.$dir);
+					@unlink($oldPath . $dir);
 				}
 			}
 		}
 
 		// Restore error reporting
-		if(!defined('KSDEBUG')) {
+		if (!defined('KSDEBUG'))
+		{
 			@error_reporting($oldErrorReporting);
 		}
 	}
 
-	public function chmod( $file, $perms )
+	public function chmod($file, $perms)
 	{
-		return @ftp_chmod($this->handle, $perms, $path);
+		if (AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			return true;
+		}
+
+		$ret = @chmod($file, $perms);
+
+		if (!$ret && $this->useFTP)
+		{
+			// Strip absolute filesystem path to website's root
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+
+			if (!empty($removePath))
+			{
+				$left = substr($file, 0, strlen($removePath));
+
+				if ($left == $removePath)
+				{
+					$file = substr($file, strlen($removePath));
+				}
+			}
+
+			// Trim slash on the left
+			$file = ltrim($file, '/');
+
+			$ret = @ftp_chmod($this->handle, $perms, $file);
+		}
+
+		return $ret;
 	}
 
-	private function is_dir( $dir )
+	private function is_dir($dir)
 	{
-		return @ftp_chdir( $this->handle, $dir );
+		if ($this->useFTP)
+		{
+			return @ftp_chdir($this->handle, $dir);
+		}
+
+		return false;
 	}
 
-	public function unlink( $file )
+	public function unlink($file)
 	{
-		$removePath = AKFactory::get('kickstart.setup.destdir','');
-		if(!empty($removePath))
+		$ret = @unlink($file);
+
+		if (!$ret && $this->useFTP)
 		{
-			$left = substr($file, 0, strlen($removePath));
-			if($left == $removePath)
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+			if (!empty($removePath))
 			{
-				$file = substr($file, strlen($removePath));
+				$left = substr($file, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$file = substr($file, strlen($removePath));
+				}
 			}
-		}
 
-		$check = '/'.trim($this->dir,'/').'/'.trim($file, '/');
+			$check = '/' . trim($this->dir, '/') . '/' . trim($file, '/');
 
-		return @ftp_delete( $this->handle, $check );
+			$ret = @ftp_delete($this->handle, $check);
+		}
+
+		return $ret;
 	}
 
-	public function rmdir( $directory )
+	public function rmdir($directory)
 	{
-		$removePath = AKFactory::get('kickstart.setup.destdir','');
-		if(!empty($removePath))
+		$ret = @rmdir($directory);
+
+		if (!$ret && $this->useFTP)
 		{
-			$left = substr($directory, 0, strlen($removePath));
-			if($left == $removePath)
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+			if (!empty($removePath))
 			{
-				$directory = substr($directory, strlen($removePath));
+				$left = substr($directory, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$directory = substr($directory, strlen($removePath));
+				}
 			}
-		}
 
-		$check = '/'.trim($this->dir,'/').'/'.trim($directory, '/');
+			$check = '/' . trim($this->dir, '/') . '/' . trim($directory, '/');
 
-		return @ftp_rmdir( $this->handle, $check );
+			$ret = @ftp_rmdir($this->handle, $check);
+		}
+
+		return $ret;
 	}
 
-	public function rename( $from, $to )
+	public function rename($from, $to)
 	{
-		$originalFrom = $from;
-		$originalTo = $to;
+		$ret = @rename($from, $to);
 
-		$removePath = AKFactory::get('kickstart.setup.destdir','');
-		if(!empty($removePath))
+		if (!$ret && $this->useFTP)
 		{
-			$left = substr($from, 0, strlen($removePath));
-			if($left == $removePath)
+			$originalFrom = $from;
+			$originalTo = $to;
+
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+			if (!empty($removePath))
 			{
-				$from = substr($from, strlen($removePath));
+				$left = substr($from, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$from = substr($from, strlen($removePath));
+				}
 			}
-		}
-		$from = '/'.trim($this->dir,'/').'/'.trim($from, '/');
+			$from = '/' . trim($this->dir, '/') . '/' . trim($from, '/');
 
-		if(!empty($removePath))
-		{
-			$left = substr($to, 0, strlen($removePath));
-			if($left == $removePath)
+			if (!empty($removePath))
 			{
-				$to = substr($to, strlen($removePath));
+				$left = substr($to, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$to = substr($to, strlen($removePath));
+				}
 			}
-		}
-		$to = '/'.trim($this->dir,'/').'/'.trim($to, '/');
+			$to = '/' . trim($this->dir, '/') . '/' . trim($to, '/');
 
-		$result = @ftp_rename( $this->handle, $from, $to );
-		if($result !== true)
-		{
-			return @rename($from, $to);
-		}
-		else
-		{
-			return true;
+			$ret = @ftp_rename($this->handle, $from, $to);
 		}
-	}
 
+		return $ret;
+	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * JPA archive extraction class
  */
 class AKUnarchiverJPA extends AKAbstractUnarchiver
 {
-	private $archiveHeaderData = array();
+	protected $archiveHeaderData = array();
 
 	protected function readArchiveHeader()
 	{
+		debugMsg('Preparing to read archive header');
 		// Initialize header data array
 		$this->archiveHeaderData = new stdClass();
 
 		// Open the first part
+		debugMsg('Opening the first part');
 		$this->nextFile();
 
 		// Fail for unreadable files
-		if( $this->fp === false ) return false;
+		if( $this->fp === false ) {
+			debugMsg('Could not open the first part');
+			return false;
+		}
 
 		// Read the signature
 		$sig = fread( $this->fp, 3 );
@@ -2639,6 +4263,7 @@ protected function readArchiveHeader()
 		if ($sig != 'JPA')
 		{
 			// Not a JPA file
+			debugMsg('Invalid archive signature');
 			$this->setError( AKText::_('ERR_NOT_A_JPA_FILE') );
 			return false;
 		}
@@ -2675,6 +4300,14 @@ protected function readArchiveHeader()
 			$this->archiveHeaderData->{$key} = $value;
 		}
 
+		debugMsg('Header data:');
+		debugMsg('Length              : '.$header_length);
+		debugMsg('Major               : '.$header_data['major']);
+		debugMsg('Minor               : '.$header_data['minor']);
+		debugMsg('File count          : '.$header_data['count']);
+		debugMsg('Uncompressed size   : '.$header_data['uncsize']);
+		debugMsg('Compressed size	  : '.$header_data['csize']);
+
 		$this->currentPartOffset = @ftell($this->fp);
 
 		$this->dataReadLength = 0;
@@ -2690,9 +4323,11 @@ protected function readFileHeader()
 	{
 		// If the current part is over, proceed to the next part please
 		if( $this->isEOF(true) ) {
+			debugMsg('Archive part EOF; moving to next file');
 			$this->nextFile();
 		}
 
+		debugMsg('Reading file signature');
 		// Get and decode Entity Description Block
 		$signature = fread($this->fp, 3);
 
@@ -2708,6 +4343,7 @@ protected function readFileHeader()
 				$this->nextFile();
 				if(!$this->isEOF(false))
 				{
+					debugMsg('Invalid file signature before end of archive encountered');
 					$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
 					return false;
 				}
@@ -2716,9 +4352,22 @@ protected function readFileHeader()
 			}
 			else
 			{
-				// This is not a file block! The archive is corrupt.
-				$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
-				return false;
+				$screwed = true;
+				if(AKFactory::get('kickstart.setup.ignoreerrors', false)) {
+					debugMsg('Invalid file block signature; launching heuristic file block signature scanner');
+					$screwed = !$this->heuristicFileHeaderLocator();
+					if(!$screwed) {
+						$signature = 'JPF';
+					} else {
+						debugMsg('Heuristics failed. Brace yourself for the imminent crash.');
+					}
+				}
+				if($screwed) {
+					debugMsg('Invalid file block signature');
+					// This is not a file block! The archive is corrupt.
+					$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
+					return false;
+				}
 			}
 		}
 		// This a JPA Entity Block. Process the header.
@@ -2744,7 +4393,7 @@ protected function readFileHeader()
 				$isRenamed = true;
 			}
 		}
-		
+
 		// Handle directory renaming
 		$isDirRenamed = false;
 		if(is_array($this->renameDirs) && (count($this->renameDirs) > 0)) {
@@ -2847,6 +4496,7 @@ protected function readFileHeader()
 		// If we have a banned file, let's skip it
 		if($isBannedFile)
 		{
+			debugMsg('Skipping file '.$this->fileHeader->file);
 			// Advance the file pointer, skipping exactly the size of the compressed data
 			$seekleft = $this->fileHeader->compressed;
 			while($seekleft > 0)
@@ -2948,6 +4598,10 @@ protected function processFileData()
 
 				}
 				break;
+
+			default:
+				debugMsg('Unknown file type '.$this->fileHeader->type);
+				break;
 		}
 	}
 
@@ -2963,7 +4617,7 @@ private function processTypeFileUncompressed()
 		// Open the output file
 		if( !AKFactory::get('kickstart.setup.dryrun','0') )
 		{
-			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false);
+			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
 			if ($this->dataReadLength == 0) {
 				$outfp = @fopen( $this->fileHeader->realFile, 'wb' );
 			} else {
@@ -2973,6 +4627,7 @@ private function processTypeFileUncompressed()
 			// Can we write to the file?
 			if( ($outfp === false) && (!$ignore) ) {
 				// An error occured
+				debugMsg('Could not write to output file');
 				$this->setError( AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile) );
 				return false;
 			}
@@ -3012,6 +4667,7 @@ private function processTypeFileUncompressed()
 				else
 				{
 					// Nope. The archive is corrupt
+					debugMsg('Not enough data in file. The archive is truncated or corrupt.');
 					$this->setError( AKText::_('ERR_CORRUPT_ARCHIVE') );
 					return false;
 				}
@@ -3050,9 +4706,10 @@ private function processTypeFileCompressedSimple()
 			$outfp = @fopen( $this->fileHeader->realFile, 'wb' );
 
 			// Can we write to the file?
-			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false);
+			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
 			if( ($outfp === false) && (!$ignore) ) {
 				// An error occured
+				debugMsg('Could not write to output file');
 				$this->setError( AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile) );
 				return false;
 			}
@@ -3082,6 +4739,7 @@ private function processTypeFileCompressedSimple()
 			}
 			else
 			{
+				debugMsg('End of local file before reading all data with no more parts left. The archive is corrupt or truncated.');
 				$this->setError( AKText::_('ERR_CORRUPT_ARCHIVE') );
 				return false;
 			}
@@ -3137,6 +4795,7 @@ private function processTypeLink()
 				}
 				else
 				{
+					debugMsg('End of local file before reading all data with no more parts left. The archive is corrupt or truncated.');
 					// Nope. The archive is corrupt
 					$this->setError( AKText::_('ERR_CORRUPT_ARCHIVE') );
 					return false;
@@ -3179,8 +4838,8 @@ protected function createDirectory()
 		if(empty($this->fileHeader->realFile)) $this->fileHeader->realFile = $this->fileHeader->file;
 		$lastSlash = strrpos($this->fileHeader->realFile, '/');
 		$dirName = substr( $this->fileHeader->realFile, 0, $lastSlash);
-		$perms = $this->flagRestorePermissions ? $retArray['permissions'] : 0755;
-		$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false);
+		$perms = $this->flagRestorePermissions ? $this->fileHeader->permissions : 0755;
+		$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($dirName);
 		if( ($this->postProcEngine->createDirRecursive($dirName, $perms) == false) && (!$ignore) ) {
 			$this->setError( AKText::sprintf('COULDNT_CREATE_DIR', $dirName) );
 			return false;
@@ -3190,8 +4849,53 @@ protected function createDirectory()
 			return true;
 		}
 	}
+
+	protected function heuristicFileHeaderLocator()
+	{
+		$ret = false;
+		$fullEOF = false;
+
+		while(!$ret && !$fullEOF) {
+			$this->currentPartOffset = @ftell($this->fp);
+			if($this->isEOF(true)) {
+				$this->nextFile();
+			}
+
+			if($this->isEOF(false)) {
+				$fullEOF = true;
+				continue;
+			}
+
+			// Read 512Kb
+			$chunk = fread($this->fp, 524288);
+			$size_read = mb_strlen($chunk,'8bit');
+			//$pos = strpos($chunk, 'JPF');
+			$pos = mb_strpos($chunk, 'JPF', 0, '8bit');
+			if($pos !== false) {
+				// We found it!
+				$this->currentPartOffset += $pos + 3;
+				@fseek($this->fp, $this->currentPartOffset, SEEK_SET);
+				$ret = true;
+			} else {
+				// Not yet found :(
+				$this->currentPartOffset = @ftell($this->fp);
+			}
+		}
+
+		return $ret;
+	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * ZIP archive extraction class
  *
@@ -3206,21 +4910,31 @@ class AKUnarchiverZIP extends AKUnarchiverJPA
 
 	protected function readArchiveHeader()
 	{
+		debugMsg('Preparing to read archive header');
 		// Initialize header data array
 		$this->archiveHeaderData = new stdClass();
 
 		// Open the first part
+		debugMsg('Opening the first part');
 		$this->nextFile();
 
 		// Fail for unreadable files
-		if( $this->fp === false ) return false;
+		if( $this->fp === false ) {
+			debugMsg('The first part is not readable');
+			return false;
+		}
 
 		// Read a possible multipart signature
 		$sigBinary = fread( $this->fp, 4 );
 		$headerData = unpack('Vsig', $sigBinary);
 
 		// Roll back if it's not a multipart archive
-		if( $headerData['sig'] == 0x04034b50 ) fseek($this->fp, -4, SEEK_CUR);
+		if( $headerData['sig'] == 0x04034b50 ) {
+			debugMsg('The archive is not multipart');
+			fseek($this->fp, -4, SEEK_CUR);
+		} else {
+			debugMsg('The archive is multipart');
+		}
 
 		$multiPartSigs = array(
 			0x08074b50,		// Multi-part ZIP
@@ -3229,11 +4943,13 @@ protected function readArchiveHeader()
 		);
 		if( !in_array($headerData['sig'], $multiPartSigs) )
 		{
+			debugMsg('Invalid header signature '.dechex($headerData['sig']));
 			$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
 			return false;
 		}
 
 		$this->currentPartOffset = @ftell($this->fp);
+		debugMsg('Current part offset after reading header: '.$this->currentPartOffset);
 
 		$this->dataReadLength = 0;
 
@@ -3248,6 +4964,7 @@ protected function readFileHeader()
 	{
 		// If the current part is over, proceed to the next part please
 		if( $this->isEOF(true) ) {
+			debugMsg('Opening next archive part');
 			$this->nextFile();
 		}
 
@@ -3261,23 +4978,17 @@ protected function readFileHeader()
 			if($junk['sig'] == 0x08074b50) {
 				// Yes, there was a signature
 				$junk = @fread($this->fp, 12);
-				if(defined('KSDEBUG')) {
-					debugMsg('Data descriptor (w/ header) skipped at '.(ftell($this->fp)-12));
-				}
+				debugMsg('Data descriptor (w/ header) skipped at '.(ftell($this->fp)-12));
 			} else {
 				// No, there was no signature, just read another 8 bytes
 				$junk = @fread($this->fp, 8);
-				if(defined('KSDEBUG')) {
-					debugMsg('Data descriptor (w/out header) skipped at '.(ftell($this->fp)-8));
-				}
+				debugMsg('Data descriptor (w/out header) skipped at '.(ftell($this->fp)-8));
 			}
 
 			// And check for EOF, too
 			if( $this->isEOF(true) ) {
-				if(defined('KSDEBUG')) {
-					debugMsg('EOF before reading header');
-				}
-				
+				debugMsg('EOF before reading header');
+
 				$this->nextFile();
 			}
 		}
@@ -3289,16 +5000,12 @@ protected function readFileHeader()
 		// Check signature
 		if(!( $headerData['sig'] == 0x04034b50 ))
 		{
-			if(defined('KSDEBUG')) {
-				debugMsg('Not a file signature at '.(ftell($this->fp)-4));
-			}
-			
+			debugMsg('Not a file signature at '.(ftell($this->fp)-4));
+
 			// The signature is not the one used for files. Is this a central directory record (i.e. we're done)?
 			if($headerData['sig'] == 0x02014b50)
 			{
-				if(defined('KSDEBUG')) {
-					debugMsg('EOCD signature at '.(ftell($this->fp)-4));
-				}
+				debugMsg('EOCD signature at '.(ftell($this->fp)-4));
 				// End of ZIP file detected. We'll just skip to the end of file...
 				while( $this->nextFile() ) {};
 				@fseek($this->fp, 0, SEEK_END); // Go to EOF
@@ -3306,9 +5013,7 @@ protected function readFileHeader()
 			}
 			else
 			{
-				if(defined('KSDEBUG')) {
-					debugMsg( 'Invalid signature ' . dechex($headerData['sig']) . ' at '.ftell($this->fp) );
-				}
+				debugMsg( 'Invalid signature ' . dechex($headerData['sig']) . ' at '.ftell($this->fp) );
 				$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
 				return false;
 			}
@@ -3323,23 +5028,23 @@ protected function readFileHeader()
 		// Read the last modified data and time
 		$lastmodtime = $headerData['lastmodtime'];
 		$lastmoddate = $headerData['lastmoddate'];
-		
+
 		if($lastmoddate && $lastmodtime)
 		{
 			// ----- Extract time
 			$v_hour = ($lastmodtime & 0xF800) >> 11;
 			$v_minute = ($lastmodtime & 0x07E0) >> 5;
 			$v_seconde = ($lastmodtime & 0x001F)*2;
-			
+
 			// ----- Extract date
 			$v_year = (($lastmoddate & 0xFE00) >> 9) + 1980;
 			$v_month = ($lastmoddate & 0x01E0) >> 5;
 			$v_day = $lastmoddate & 0x001F;
-			
+
 			// ----- Get UNIX date format
 			$this->fileHeader->timestamp = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 		}
-		
+
 		$isBannedFile = false;
 
 		$this->fileHeader->compressed	= $headerData['compsize'];
@@ -3360,12 +5065,12 @@ protected function readFileHeader()
 				$isRenamed = true;
 			}
 		}
-		
+
 		// Handle directory renaming
 		$isDirRenamed = false;
 		if(is_array($this->renameDirs) && (count($this->renameDirs) > 0)) {
-			if(array_key_exists(dirname($file), $this->renameDirs)) {
-				$file = rtrim($this->renameDirs[dirname($file)],'/').'/'.basename($file);
+			if(array_key_exists(dirname($this->fileHeader->file), $this->renameDirs)) {
+				$file = rtrim($this->renameDirs[dirname($this->fileHeader->file)],'/').'/'.basename($this->fileHeader->file);
 				$isRenamed = true;
 				$isDirRenamed = true;
 			}
@@ -3375,11 +5080,9 @@ protected function readFileHeader()
 		if($extraFieldLength > 0) {
 			$extrafield = fread( $this->fp, $extraFieldLength );
 		}
-		
-		if(defined('KSDEBUG')) {
-			debugMsg( '*'.ftell($this->fp).' IS START OF '.$this->fileHeader->file. ' ('.$this->fileHeader->compressed.' bytes)' );
-		}
-		
+
+		debugMsg( '*'.ftell($this->fp).' IS START OF '.$this->fileHeader->file. ' ('.$this->fileHeader->compressed.' bytes)' );
+
 
 		// Decide filetype -- Check for directories
 		$this->fileHeader->type = 'file';
@@ -3424,230 +5127,71 @@ protected function readFileHeader()
 				$curPos = @ftell($this->fp);
 				$canSeek = $curSize - $curPos;
 				if($canSeek > $seekleft) $canSeek = $seekleft;
-				@fseek( $this->fp, $canSeek, SEEK_CUR );
-				$seekleft -= $canSeek;
-				if($seekleft) $this->nextFile();
-			}
-
-			$this->currentPartOffset = @ftell($this->fp);
-			$this->runState = AK_STATE_DONE;
-			return true;
-		}
-
-		// Last chance to prepend a path to the filename
-		if(!empty($this->addPath) && !$isDirRenamed)
-		{
-			$this->fileHeader->file = $this->addPath.$this->fileHeader->file;
-		}
-
-		// Get the translated path name
-		if($this->fileHeader->type == 'file')
-		{
-			$this->fileHeader->realFile = $this->postProcEngine->processFilename( $this->fileHeader->file );
-		}
-		elseif($this->fileHeader->type == 'dir')
-		{
-			$this->fileHeader->timestamp = 0;
-
-			$dir = $this->fileHeader->file;
-
-			$this->postProcEngine->createDirRecursive( $this->fileHeader->file, 0755 );
-			$this->postProcEngine->processFilename(null);
-		}
-		else
-		{
-			// Symlink; do not post-process
-			$this->fileHeader->timestamp = 0;
-			$this->postProcEngine->processFilename(null);
-		}
-
-		$this->createDirectory();
-
-		// Header is read
-		$this->runState = AK_STATE_HEADER;
-
-		return true;
-	}
-
-}
-
-/**
- * Timer class
- */
-class AKCoreTimer extends AKAbstractObject
-{
-	/** @var int Maximum execution time allowance per step */
-	private $max_exec_time = null;
-
-	/** @var int Timestamp of execution start */
-	private $start_time = null;
-
-	/**
-	 * Public constructor, creates the timer object and calculates the execution time limits
-	 * @return AECoreTimer
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Initialize start time
-		$this->start_time = $this->microtime_float();
-
-		// Get configured max time per step and bias
-		$config_max_exec_time	= AKFactory::get('kickstart.tuning.max_exec_time', 14);
-		$bias					= AKFactory::get('kickstart.tuning.run_time_bias', 75)/100;
-
-		// Get PHP's maximum execution time (our upper limit)
-		if(@function_exists('ini_get'))
-		{
-			$php_max_exec_time = @ini_get("maximum_execution_time");
-			if ( (!is_numeric($php_max_exec_time)) || ($php_max_exec_time == 0) ) {
-				// If we have no time limit, set a hard limit of about 10 seconds
-				// (safe for Apache and IIS timeouts, verbose enough for users)
-				$php_max_exec_time = 14;
+				@fseek( $this->fp, $canSeek, SEEK_CUR );
+				$seekleft -= $canSeek;
+				if($seekleft) $this->nextFile();
 			}
+
+			$this->currentPartOffset = @ftell($this->fp);
+			$this->runState = AK_STATE_DONE;
+			return true;
 		}
-		else
+
+		// Last chance to prepend a path to the filename
+		if(!empty($this->addPath) && !$isDirRenamed)
 		{
-			// If ini_get is not available, use a rough default
-			$php_max_exec_time = 14;
+			$this->fileHeader->file = $this->addPath.$this->fileHeader->file;
 		}
 
-		// Apply an arbitrary correction to counter CMS load time
-		$php_max_exec_time--;
-
-		// Apply bias
-		$php_max_exec_time = $php_max_exec_time * $bias;
-		$config_max_exec_time = $config_max_exec_time * $bias;
-
-		// Use the most appropriate time limit value
-		if( $config_max_exec_time > $php_max_exec_time )
+		// Get the translated path name
+		if($this->fileHeader->type == 'file')
 		{
-			$this->max_exec_time = $php_max_exec_time;
+			$this->fileHeader->realFile = $this->postProcEngine->processFilename( $this->fileHeader->file );
 		}
-		else
+		elseif($this->fileHeader->type == 'dir')
 		{
-			$this->max_exec_time = $config_max_exec_time;
-		}
-	}
-
-	/**
-	 * Wake-up function to reset internal timer when we get unserialized
-	 */
-	public function __wakeup()
-	{
-		// Re-initialize start time on wake-up
-		$this->start_time = $this->microtime_float();
-	}
-
-	/**
-	 * Gets the number of seconds left, before we hit the "must break" threshold
-	 * @return float
-	 */
-	public function getTimeLeft()
-	{
-		return $this->max_exec_time - $this->getRunningTime();
-	}
-
-	/**
-	 * Gets the time elapsed since object creation/unserialization, effectively how
-	 * long Akeeba Engine has been processing data
-	 * @return float
-	 */
-	public function getRunningTime()
-	{
-		return $this->microtime_float() - $this->start_time;
-	}
+			$this->fileHeader->timestamp = 0;
 
-	/**
-	 * Returns the current timestampt in decimal seconds
-	 */
-	private function microtime_float()
-	{
-		list($usec, $sec) = explode(" ", microtime());
-		return ((float)$usec + (float)$sec);
-	}
+			$dir = $this->fileHeader->file;
 
-	/**
-	 * Enforce the minimum execution time
-	 */
-	public function enforce_min_exec_time()
-	{
-		// Try to get a sane value for PHP's maximum_execution_time INI parameter
-		if(@function_exists('ini_get'))
-		{
-			$php_max_exec = @ini_get("maximum_execution_time");
+			$this->postProcEngine->createDirRecursive( $this->fileHeader->file, 0755 );
+			$this->postProcEngine->processFilename(null);
 		}
 		else
 		{
-			$php_max_exec = 10;
-		}
-		if ( ($php_max_exec == "") || ($php_max_exec == 0) ) {
-			$php_max_exec = 10;
+			// Symlink; do not post-process
+			$this->fileHeader->timestamp = 0;
+			$this->postProcEngine->processFilename(null);
 		}
-		// Decrease $php_max_exec time by 500 msec we need (approx.) to tear down
-		// the application, as well as another 500msec added for rounding
-		// error purposes. Also make sure this is never gonna be less than 0.
-		$php_max_exec = max($php_max_exec * 1000 - 1000, 0);
-
-		// Get the "minimum execution time per step" Akeeba Backup configuration variable
-		$minexectime = AKFactory::get('kickstart.tuning.min_exec_time',0);
-		if(!is_numeric($minexectime)) $minexectime = 0;
 
-		// Make sure we are not over PHP's time limit!
-		if($minexectime > $php_max_exec) $minexectime = $php_max_exec;
+		$this->createDirectory();
 
-		// Get current running time
-		$elapsed_time = $this->getRunningTime() * 1000;
+		// Header is read
+		$this->runState = AK_STATE_HEADER;
 
-			// Only run a sleep delay if we haven't reached the minexectime execution time
-		if( ($minexectime > $elapsed_time) && ($elapsed_time > 0) )
-		{
-			$sleep_msec = $minexectime - $elapsed_time;
-			if(function_exists('usleep'))
-			{
-				usleep(1000 * $sleep_msec);
-			}
-			elseif(function_exists('time_nanosleep'))
-			{
-				$sleep_sec = floor($sleep_msec / 1000);
-				$sleep_nsec = 1000000 * ($sleep_msec - ($sleep_sec * 1000));
-				time_nanosleep($sleep_sec, $sleep_nsec);
-			}
-			elseif(function_exists('time_sleep_until'))
-			{
-				$until_timestamp = time() + $sleep_msec / 1000;
-				time_sleep_until($until_timestamp);
-			}
-			elseif(function_exists('sleep'))
-			{
-				$sleep_sec = ceil($sleep_msec/1000);
-				sleep( $sleep_sec );
-			}
-		}
-		elseif( $elapsed_time > 0 )
-		{
-			// No sleep required, even if user configured us to be able to do so.
-		}
+		return true;
 	}
 
-	/**
-	 * Reset the timer. It should only be used in CLI mode!
-	 */
-	public function resetTime()
-	{
-		$this->start_time = $this->microtime_float();
-	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * JPS archive extraction class
  */
 class AKUnarchiverJPS extends AKUnarchiverJPA
 {
-	private $archiveHeaderData = array();
+	protected $archiveHeaderData = array();
 
-	private $password = '';
+	protected $password = '';
 
 	public function __construct()
 	{
@@ -3788,7 +5332,7 @@ protected function readFileHeader()
 				$isRenamed = true;
 			}
 		}
-		
+
 		// Handle directory renaming
 		$isDirRenamed = false;
 		if(is_array($this->renameDirs) && (count($this->renameDirs) > 0)) {
@@ -3870,7 +5414,7 @@ protected function readFileHeader()
 				else
 				{
 					// Skip forward by the amount of compressed data
-					$miniHead = unpack('Vencsize/Vdecsize');
+					$miniHead = unpack('Vencsize/Vdecsize', $binMiniHead);
 					@fseek($this->fp, $miniHead['encsize'], SEEK_CUR);
 				}
 			}
@@ -3978,7 +5522,7 @@ private function processTypeFileUncompressed()
 		// Open the output file
 		if( !AKFactory::get('kickstart.setup.dryrun','0') )
 		{
-			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false);
+			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
 			if ($this->dataReadLength == 0) {
 				$outfp = @fopen( $this->fileHeader->realFile, 'wb' );
 			} else {
@@ -4028,7 +5572,7 @@ private function processTypeFileCompressedSimple()
 			$outfp = @fopen( $this->fileHeader->realFile, 'wb' );
 
 			// Can we write to the file?
-			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false);
+			$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
 			if( ($outfp === false) && (!$ignore) ) {
 				// An error occured
 				$this->setError( AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile) );
@@ -4153,6 +5697,8 @@ private function processTypeFileCompressedSimple()
 			$this->runState = AK_STATE_DATAREAD;
 			$this->dataReadLength = 0;
 		}
+
+		return true;
 	}
 
 	/**
@@ -4227,66 +5773,258 @@ private function processTypeLink()
 			}
 		}
 
-		// Decrypt the data
-		$data = AKEncryptionAES::AESDecryptCBC($data, $this->password, 128);
-
-		// Is the length of the decrypted data less than expected?
-		$data_length = akstringlen($data);
-		if($data_length < $miniHeader['decsize']) {
-			$this->setError(AKText::_('ERR_INVALID_JPS_PASSWORD'));
-			return false;
-		}
+		// Decrypt the data
+		$data = AKEncryptionAES::AESDecryptCBC($data, $this->password, 128);
+
+		// Is the length of the decrypted data less than expected?
+		$data_length = akstringlen($data);
+		if($data_length < $miniHeader['decsize']) {
+			$this->setError(AKText::_('ERR_INVALID_JPS_PASSWORD'));
+			return false;
+		}
+
+		// Trim the data
+		$data = substr($data,0,$miniHeader['decsize']);
+
+		// Try to remove an existing file or directory by the same name
+		if(file_exists($this->fileHeader->file)) { @unlink($this->fileHeader->file); @rmdir($this->fileHeader->file); }
+		// Remove any trailing slash
+		if(substr($this->fileHeader->file, -1) == '/') $this->fileHeader->file = substr($this->fileHeader->file, 0, -1);
+		// Create the symlink - only possible within PHP context. There's no support built in the FTP protocol, so no postproc use is possible here :(
+
+		if( !AKFactory::get('kickstart.setup.dryrun','0') )
+		{
+			@symlink($data, $this->fileHeader->file);
+		}
+
+		$this->runState = AK_STATE_DATAREAD;
+
+		return true; // No matter if the link was created!
+	}
+
+	/**
+	 * Process the file data of a directory entry
+	 * @return bool
+	 */
+	private function processTypeDir()
+	{
+		// Directory entries in the JPA do not have file data, therefore we're done processing the entry
+		$this->runState = AK_STATE_DATAREAD;
+		return true;
+	}
+
+	/**
+	 * Creates the directory this file points to
+	 */
+	protected function createDirectory()
+	{
+		if( AKFactory::get('kickstart.setup.dryrun','0') ) return true;
+
+		// Do we need to create a directory?
+		$lastSlash = strrpos($this->fileHeader->realFile, '/');
+		$dirName = substr( $this->fileHeader->realFile, 0, $lastSlash);
+		$perms = $this->flagRestorePermissions ? $retArray['permissions'] : 0755;
+		$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($dirName);
+		if( ($this->postProcEngine->createDirRecursive($dirName, $perms) == false) && (!$ignore) ) {
+			$this->setError( AKText::sprintf('COULDNT_CREATE_DIR', $dirName) );
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Timer class
+ */
+class AKCoreTimer extends AKAbstractObject
+{
+	/** @var int Maximum execution time allowance per step */
+	private $max_exec_time = null;
+
+	/** @var int Timestamp of execution start */
+	private $start_time = null;
+
+	/**
+	 * Public constructor, creates the timer object and calculates the execution time limits
+	 * @return AECoreTimer
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Initialize start time
+		$this->start_time = $this->microtime_float();
+
+		// Get configured max time per step and bias
+		$config_max_exec_time	= AKFactory::get('kickstart.tuning.max_exec_time', 14);
+		$bias					= AKFactory::get('kickstart.tuning.run_time_bias', 75)/100;
+
+		// Get PHP's maximum execution time (our upper limit)
+		if(@function_exists('ini_get'))
+		{
+			$php_max_exec_time = @ini_get("maximum_execution_time");
+			if ( (!is_numeric($php_max_exec_time)) || ($php_max_exec_time == 0) ) {
+				// If we have no time limit, set a hard limit of about 10 seconds
+				// (safe for Apache and IIS timeouts, verbose enough for users)
+				$php_max_exec_time = 14;
+			}
+		}
+		else
+		{
+			// If ini_get is not available, use a rough default
+			$php_max_exec_time = 14;
+		}
+
+		// Apply an arbitrary correction to counter CMS load time
+		$php_max_exec_time--;
 
-		// Trim the data
-		$data = substr($data,0,$miniHeader['decsize']);
+		// Apply bias
+		$php_max_exec_time = $php_max_exec_time * $bias;
+		$config_max_exec_time = $config_max_exec_time * $bias;
 
-		// Try to remove an existing file or directory by the same name
-		if(file_exists($this->fileHeader->realFile)) { @unlink($this->fileHeader->realFile); @rmdir($this->fileHeader->realFile); }
-		// Remove any trailing slash
-		if(substr($this->fileHeader->realFile, -1) == '/') $this->fileHeader->realFile = substr($this->fileHeader->realFile, 0, -1);
-		// Create the symlink - only possible within PHP context. There's no support built in the FTP protocol, so no postproc use is possible here :(
-		if( !AKFactory::get('kickstart.setup.dryrun','0') )
-			@symlink($data, $this->fileHeader->realFile);
+		// Use the most appropriate time limit value
+		if( $config_max_exec_time > $php_max_exec_time )
+		{
+			$this->max_exec_time = $php_max_exec_time;
+		}
+		else
+		{
+			$this->max_exec_time = $config_max_exec_time;
+		}
+	}
 
-		$this->runState = AK_STATE_DATAREAD;
+	/**
+	 * Wake-up function to reset internal timer when we get unserialized
+	 */
+	public function __wakeup()
+	{
+		// Re-initialize start time on wake-up
+		$this->start_time = $this->microtime_float();
+	}
 
-		return true; // No matter if the link was created!
+	/**
+	 * Gets the number of seconds left, before we hit the "must break" threshold
+	 * @return float
+	 */
+	public function getTimeLeft()
+	{
+		return $this->max_exec_time - $this->getRunningTime();
 	}
 
 	/**
-	 * Process the file data of a directory entry
-	 * @return bool
+	 * Gets the time elapsed since object creation/unserialization, effectively how
+	 * long Akeeba Engine has been processing data
+	 * @return float
 	 */
-	private function processTypeDir()
+	public function getRunningTime()
 	{
-		// Directory entries in the JPA do not have file data, therefore we're done processing the entry
-		$this->runState = AK_STATE_DATAREAD;
-		return true;
+		return $this->microtime_float() - $this->start_time;
 	}
 
 	/**
-	 * Creates the directory this file points to
+	 * Returns the current timestampt in decimal seconds
 	 */
-	protected function createDirectory()
+	private function microtime_float()
 	{
-		if( AKFactory::get('kickstart.setup.dryrun','0') ) return true;
+		list($usec, $sec) = explode(" ", microtime());
+		return ((float)$usec + (float)$sec);
+	}
 
-		// Do we need to create a directory?
-		$lastSlash = strrpos($this->fileHeader->realFile, '/');
-		$dirName = substr( $this->fileHeader->realFile, 0, $lastSlash);
-		$perms = $this->flagRestorePermissions ? $retArray['permissions'] : 0755;
-		$ignore = AKFactory::get('kickstart.setup.ignoreerrors', false);
-		if( ($this->postProcEngine->createDirRecursive($dirName, $perms) == false) && (!$ignore) ) {
-			$this->setError( AKText::sprintf('COULDNT_CREATE_DIR', $dirName) );
-			return false;
+	/**
+	 * Enforce the minimum execution time
+	 */
+	public function enforce_min_exec_time()
+	{
+		// Try to get a sane value for PHP's maximum_execution_time INI parameter
+		if(@function_exists('ini_get'))
+		{
+			$php_max_exec = @ini_get("maximum_execution_time");
 		}
 		else
 		{
-			return true;
+			$php_max_exec = 10;
+		}
+		if ( ($php_max_exec == "") || ($php_max_exec == 0) ) {
+			$php_max_exec = 10;
+		}
+		// Decrease $php_max_exec time by 500 msec we need (approx.) to tear down
+		// the application, as well as another 500msec added for rounding
+		// error purposes. Also make sure this is never gonna be less than 0.
+		$php_max_exec = max($php_max_exec * 1000 - 1000, 0);
+
+		// Get the "minimum execution time per step" Akeeba Backup configuration variable
+		$minexectime = AKFactory::get('kickstart.tuning.min_exec_time',0);
+		if(!is_numeric($minexectime)) $minexectime = 0;
+
+		// Make sure we are not over PHP's time limit!
+		if($minexectime > $php_max_exec) $minexectime = $php_max_exec;
+
+		// Get current running time
+		$elapsed_time = $this->getRunningTime() * 1000;
+
+			// Only run a sleep delay if we haven't reached the minexectime execution time
+		if( ($minexectime > $elapsed_time) && ($elapsed_time > 0) )
+		{
+			$sleep_msec = $minexectime - $elapsed_time;
+			if(function_exists('usleep'))
+			{
+				usleep(1000 * $sleep_msec);
+			}
+			elseif(function_exists('time_nanosleep'))
+			{
+				$sleep_sec = floor($sleep_msec / 1000);
+				$sleep_nsec = 1000000 * ($sleep_msec - ($sleep_sec * 1000));
+				time_nanosleep($sleep_sec, $sleep_nsec);
+			}
+			elseif(function_exists('time_sleep_until'))
+			{
+				$until_timestamp = time() + $sleep_msec / 1000;
+				time_sleep_until($until_timestamp);
+			}
+			elseif(function_exists('sleep'))
+			{
+				$sleep_sec = ceil($sleep_msec/1000);
+				sleep( $sleep_sec );
+			}
+		}
+		elseif( $elapsed_time > 0 )
+		{
+			// No sleep required, even if user configured us to be able to do so.
 		}
 	}
+
+	/**
+	 * Reset the timer. It should only be used in CLI mode!
+	 */
+	public function resetTime()
+	{
+		$this->start_time = $this->microtime_float();
+	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * A filesystem scanner which uses opendir()
  */
@@ -4361,6 +6099,16 @@ public function &getFolders($folder, $pattern = '*')
 	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * A simple INI-based i18n engine
  */
@@ -4383,6 +6131,7 @@ class AKText extends AKAbstractObject
 		'WRONG_FTP_PATH1' => 'Wrong FTP initial directory - the directory doesn\'t exist',
 		'FTP_CANT_CREATE_DIR' => 'Could not create directory %s',
 		'FTP_TEMPDIR_NOT_WRITABLE' => 'Could not find or create a writable temporary directory',
+		'SFTP_TEMPDIR_NOT_WRITABLE' => 'Could not find or create a writable temporary directory',
 		'FTP_COULDNT_UPLOAD' => 'Could not upload %s',
 		'THINGS_HEADER' => 'Things you should know about Akeeba Kickstart',
 		'THINGS_01' => 'Kickstart is not an installer. It is an archive extraction tool. The actual installer was put inside the archive file at backup time.',
@@ -4399,23 +6148,45 @@ class AKText extends AKAbstractObject
 		'ARCHIVE_FILE' => 'Archive file:',
 		'SELECT_EXTRACTION' => 'Select an extraction method',
 		'WRITE_TO_FILES' => 'Write to files:',
+		'WRITE_HYBRID' => 'Hybrid (use FTP only if needed)',
 		'WRITE_DIRECTLY' => 'Directly',
-		'WRITE_FTP' => 'Use FTP',
-		'FTP_HOST' => 'FTP host name:',
-		'FTP_PORT' => 'FTP port:',
+		'WRITE_FTP' => 'Use FTP for all files',
+        'WRITE_SFTP' => 'Use SFTP for all files',
+		'FTP_HOST' => '(S)FTP host name:',
+		'FTP_PORT' => '(S)FTP port:',
 		'FTP_FTPS' => 'Use FTP over SSL (FTPS)',
 		'FTP_PASSIVE' => 'Use FTP Passive Mode',
-		'FTP_USER' => 'FTP user name:',
-		'FTP_PASS' => 'FTP password:',
-		'FTP_DIR' => 'FTP directory:',
+		'FTP_USER' => '(S)FTP user name:',
+		'FTP_PASS' => '(S)FTP password:',
+		'FTP_DIR' => '(S)FTP directory:',
 		'FTP_TEMPDIR' => 'Temporary directory:',
 		'FTP_CONNECTION_OK' => 'FTP Connection Established',
+		'SFTP_CONNECTION_OK' => 'SFTP Connection Established',
 		'FTP_CONNECTION_FAILURE' => 'The FTP Connection Failed',
+		'SFTP_CONNECTION_FAILURE' => 'The SFTP Connection Failed',
 		'FTP_TEMPDIR_WRITABLE' => 'The temporary directory is writable.',
 		'FTP_TEMPDIR_UNWRITABLE' => 'The temporary directory is not writable. Please check the permissions.',
+        'FTPBROWSER_ERROR_HOSTNAME' => "Invalid FTP host or port",
+        'FTPBROWSER_ERROR_USERPASS' => "Invalid FTP username or password",
+        'FTPBROWSER_ERROR_NOACCESS' => "Directory doesn't exist or you don't have enough permissions to access it",
+        'FTPBROWSER_ERROR_UNSUPPORTED' => "Sorry, your FTP server doesn't support our FTP directory browser.",
+        'FTPBROWSER_LBL_GOPARENT' => "&lt;up one level&gt;",
+        'FTPBROWSER_LBL_INSTRUCTIONS' => 'Click on a directory to navigate into it. Click on OK to select that directory, Cancel to abort the procedure.',
+        'FTPBROWSER_LBL_ERROR' => 'An error occurred',
+        'SFTP_NO_SSH2' => 'Your web server does not have the SSH2 PHP module, therefore can not connect to SFTP servers.',
+        'SFTP_NO_FTP_SUPPORT' => 'Your SSH server does not allow SFTP connections',
+        'SFTP_WRONG_USER' => 'Wrong SFTP username or password',
+        'SFTP_WRONG_STARTING_DIR' => 'You must supply a valid absolute path',
+        'SFTPBROWSER_ERROR_NOACCESS' => "Directory doesn't exist or you don't have enough permissions to access it",
+        'SFTP_COULDNT_UPLOAD' => 'Could not upload %s',
+        'SFTP_CANT_CREATE_DIR' => 'Could not create directory %s',
+        'UI-ROOT' => '&lt;root&gt;',
+        'CONFIG_UI_FTPBROWSER_TITLE' => 'FTP Directory Browser',
+        'FTP_BROWSE' => 'Browse',
 		'BTN_CHECK' => 'Check',
 		'BTN_RESET' => 'Reset',
 		'BTN_TESTFTPCON' => 'Test FTP connection',
+		'BTN_TESTSFTPCON' => 'Test SFTP connection',
 		'BTN_GOTOSTART' => 'Start over',
 		'FINE_TUNE' => 'Fine tune',
 		'MIN_EXEC_TIME' => 'Minimum execution time:',
@@ -4446,7 +6217,12 @@ class AKText extends AKAbstractObject
 		'UPDATE_HEADER' => 'An updated version of Akeeba Kickstart (<span id="update-version">unknown</span>) is available!',
 		'UPDATE_NOTICE' => 'You are advised to always use the latest version of Akeeba Kickstart available. Older versions may be subject to bugs and will not be supported.',
 		'UPDATE_DLNOW' => 'Download now',
-		'UPDATE_MOREINFO' => 'More information'
+		'UPDATE_MOREINFO' => 'More information',
+		'IGNORE_MOST_ERRORS' => 'Ignore most errors',
+		'WRONG_FTP_PATH2' => 'Wrong FTP initial directory - the directory doesn\'t correspond to your site\'s web root',
+		'ARCHIVE_DIRECTORY' => 'Archive directory:',
+		'RELOAD_ARCHIVES'	=> 'Reload',
+		'CONFIG_UI_SFTPBROWSER_TITLE'	=> 'SFTP Directory Browser',
 	);
 
 	/**
@@ -4481,7 +6257,7 @@ public function __construct()
 
 	/**
 	 * Singleton pattern for Language
-	 * @return Language The global Language instance
+	 * @return AKText The global AKText instance
 	 */
 	public static function &getInstance()
 	{
@@ -4594,24 +6370,32 @@ public function getBrowserLanguage()
 
 		$this->language = null;
 		$basename=basename(__FILE__, '.php') . '.ini';
-		
+
 		// Try to match main language part of the filename, irrespective of the location, e.g. de_DE will do if de_CH doesn't exist.
-		$fs = new AKUtilsLister();
-		$iniFiles = $fs->getFiles( dirname(__FILE__), '*.'.$basename );
-		if(empty($iniFiles) && ($basename != 'kickstart.ini')) {
-			$basename = 'kickstart.ini';
-			$iniFiles = $fs->getFiles( dirname(__FILE__), '*.'.$basename );
+		if (class_exists('AKUtilsLister'))
+		{
+			$fs = new AKUtilsLister();
+			$iniFiles = $fs->getFiles(KSROOTDIR, '*.'.$basename );
+			if(empty($iniFiles) && ($basename != 'kickstart.ini')) {
+				$basename = 'kickstart.ini';
+				$iniFiles = $fs->getFiles(KSROOTDIR, '*.'.$basename );
+			}
+		}
+		else
+		{
+			$iniFiles = null;
 		}
+
 		if (is_array($iniFiles)) {
 			foreach($user_languages as $languageStruct)
 			{
 				if(is_null($this->language))
 				{
 					// Get files matching the main lang part
-					$iniFiles = $fs->getFiles( dirname(__FILE__), $languageStruct[1].'-??.'.$basename );
+					$iniFiles = $fs->getFiles(KSROOTDIR, $languageStruct[1].'-??.'.$basename );
 					if (count($iniFiles) > 0) {
 						$filename = $iniFiles[0];
-						$filename = substr($filename, strlen(dirname(__FILE__))+1);
+						$filename = substr($filename, strlen(KSROOTDIR)+1);
 						$this->language = substr($filename, 0, 5);
 					} else {
 						$this->language = null;
@@ -4619,7 +6403,7 @@ public function getBrowserLanguage()
 				}
 			}
 		}
-		
+
 		if(is_null($this->language)) {
 			// Try to find a full language match
 			foreach($user_languages as $languageStruct)
@@ -4641,15 +6425,22 @@ public function getBrowserLanguage()
 				}
 			}
 		}
-		
+
 		// Now, scan for full language based on the partial match
-		
+
 	}
 
 	private function loadTranslation( $lang = null )
 	{
-		$dirname = function_exists('getcwd') ? getcwd() : dirname(__FILE__);
-		$basename=basename(__FILE__, '.php') . '.ini';
+		if (defined('KSLANGDIR'))
+		{
+			$dirname = KSLANGDIR;
+		}
+		else
+		{
+			$dirname = KSROOTDIR;
+		}
+		$basename = basename(__FILE__, '.php') . '.ini';
 		if( empty($lang) ) $lang = $this->language;
 
 		$translationFilename = $dirname.DIRECTORY_SEPARATOR.$lang.'.'.$basename;
@@ -4668,6 +6459,14 @@ private function loadTranslation( $lang = null )
 		}
 	}
 
+	public function addDefaultLanguageStrings($stringList = array())
+	{
+		if(!is_array($stringList)) return;
+		if(empty($stringList)) return;
+
+		$this->strings = array_merge($stringList, $this->strings);
+	}
+
 	/**
 	 * A PHP based INI file parser.
 	 *
@@ -4765,6 +6564,16 @@ public static function parse_ini_file($file, $process_sections = false, $raw_dat
 	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 /**
  * The Akeeba Kickstart Factory class
  * This class is reponssible for instanciating all Akeeba Kicsktart classes
@@ -4952,20 +6761,29 @@ public static function &getUnarchiver( $configOverride = null )
 		$destdir = self::get('kickstart.setup.destdir', null);
 		if(empty($destdir))
 		{
-			$destdir = function_exists('getcwd') ? getcwd() : dirname(__FILE__);
+			$destdir = KSROOTDIR;
 		}
 
 		$object = self::getClassInstance($class_name);
 		if( $object->getState() == 'init')
 		{
+			$sourcePath = self::get('kickstart.setup.sourcepath', '');
+			$sourceFile = self::get('kickstart.setup.sourcefile', '');
+
+			if (!empty($sourcePath))
+			{
+				$sourceFile = rtrim($sourcePath, '/\\') . '/' . $sourceFile;
+			}
+
 			// Initialize the object
 			$config = array(
-				'filename'				=> self::get('kickstart.setup.sourcefile', ''),
+				'filename'				=> $sourceFile,
 				'restore_permissions'	=> self::get('kickstart.setup.restoreperms', 0),
 				'post_proc'				=> self::get('kickstart.procengine', 'direct'),
-				'add_path'				=> $destdir,
-				'rename_files'			=> array( '.htaccess' => 'htaccess.bak', 'php.ini' => 'php.ini.bak' ),
-				'skip_files'			=> array( basename(__FILE__), 'kickstart.php', 'abiautomation.ini', 'htaccess.bak', 'php.ini.bak' )
+				'add_path'				=> self::get('kickstart.setup.targetpath', $destdir),
+				'rename_files'			=> array('.htaccess' => 'htaccess.bak', 'php.ini' => 'php.ini.bak', 'web.config' => 'web.config.bak'),
+				'skip_files'			=> array(basename(__FILE__), 'kickstart.php', 'abiautomation.ini', 'htaccess.bak', 'php.ini.bak', 'cacert.pem'),
+				'ignoredirectories'		=> array('tmp', 'log', 'logs'),
 			);
 
 			if(!defined('KICKSTART'))
@@ -5001,19 +6819,25 @@ public static function &getTimer()
 }
 
 /**
- * AES implementation in PHP (c) Chris Veness 2005-2011
- * (http://www.movable-type.co.uk/scripts/aes-php.html)
- * I offer these formulæ & scripts for free use and adaptation as my contribution to the 
- * open-source info-sphere from which I have received so much. You are welcome to re-use these 
- * scripts [under a simple attribution license or a GPL licence, without any warranty express or implied] 
- * provided solely that you retain my copyright notice and a link to this page.
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * AES implementation in PHP (c) Chris Veness 2005-2013.
+ * Right to use and adapt is granted for under a simple creative commons attribution
  * licence. No warranty of any form is offered.
  *
  * Modified for Akeeba Backup by Nicholas K. Dionysopoulos
  */
 class AKEncryptionAES
 {
-	// Sbox is pre-computed multiplicative inverse in GF(2^8) used in SubBytes and KeyExpansion [�5.1.1]
+	// Sbox is pre-computed multiplicative inverse in GF(2^8) used in SubBytes and KeyExpansion [�5.1.1]
 	protected static $Sbox =
 			 array(0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
 	               0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
@@ -5032,7 +6856,7 @@ class AKEncryptionAES
 	               0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
 	               0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16);
 
-	// Rcon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [�5.2]
+	// Rcon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [�5.2]
 	protected static $Rcon = array(
 				   array(0x00, 0x00, 0x00, 0x00),
 	               array(0x01, 0x00, 0x00, 0x00),
@@ -5056,11 +6880,11 @@ class AKEncryptionAES
 	 *              generated from the cipher key by KeyExpansion()
 	 * @return      ciphertext as byte-array (16 bytes)
 	 */
-	protected static function Cipher($input, $w) {    // main Cipher function [�5.1]
+	protected static function Cipher($input, $w) {    // main Cipher function [�5.1]
 	  $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
 	  $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
-	  $state = array();  // initialise 4xNb byte-array 'state' with input [�3.4]
+	  $state = array();  // initialise 4xNb byte-array 'state' with input [�3.4]
 	  for ($i=0; $i<4*$Nb; $i++) $state[$i%4][floor($i/4)] = $input[$i];
 
 	  $state = self::AddRoundKey($state, $w, 0, $Nb);
@@ -5076,26 +6900,26 @@ protected static function Cipher($input, $w) {    // main Cipher function [ï¿
 	  $state = self::ShiftRows($state, $Nb);
 	  $state = self::AddRoundKey($state, $w, $Nr, $Nb);
 
-	  $output = array(4*$Nb);  // convert state to 1-d array before returning [�3.4]
+	  $output = array(4*$Nb);  // convert state to 1-d array before returning [�3.4]
 	  for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
 	  return $output;
 	}
 
-	protected static function AddRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [�5.1.4]
+	protected static function AddRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [�5.1.4]
 	  for ($r=0; $r<4; $r++) {
 	    for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
 	  }
 	  return $state;
 	}
 
-	protected static function SubBytes($s, $Nb) {    // apply SBox to state S [�5.1.1]
+	protected static function SubBytes($s, $Nb) {    // apply SBox to state S [�5.1.1]
 	  for ($r=0; $r<4; $r++) {
 	    for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$Sbox[$s[$r][$c]];
 	  }
 	  return $s;
 	}
 
-	protected static function ShiftRows($s, $Nb) {    // shift row r of state S left by r bytes [�5.1.2]
+	protected static function ShiftRows($s, $Nb) {    // shift row r of state S left by r bytes [�5.1.2]
 	  $t = array(4);
 	  for ($r=1; $r<4; $r++) {
 	    for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
@@ -5104,15 +6928,15 @@ protected static function ShiftRows($s, $Nb) {    // shift row r of state S left
 	  return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
 	}
 
-	protected static function MixColumns($s, $Nb) {   // combine bytes of each col of state S [�5.1.3]
+	protected static function MixColumns($s, $Nb) {   // combine bytes of each col of state S [�5.1.3]
 	  for ($c=0; $c<4; $c++) {
 	    $a = array(4);  // 'a' is a copy of the current column from 's'
-	    $b = array(4);  // 'b' is a�{02} in GF(2^8)
+	    $b = array(4);  // 'b' is a�{02} in GF(2^8)
 	    for ($i=0; $i<4; $i++) {
 	      $a[$i] = $s[$i][$c];
 	      $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
 	    }
-	    // a[n] ^ b[n] is a�{03} in GF(2^8)
+	    // a[n] ^ b[n] is a�{03} in GF(2^8)
 	    $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
 	    $s[1][$c] = $a[0] ^ $b[1] ^ $a[2] ^ $b[2] ^ $a[3]; // a0 * 2*a1 + 3*a2 + a3
 	    $s[2][$c] = $a[0] ^ $a[1] ^ $b[2] ^ $a[3] ^ $b[3]; // a0 + a1 + 2*a2 + 3*a3
@@ -5128,7 +6952,7 @@ protected static function MixColumns($s, $Nb) {   // combine bytes of each col o
 	 * @param key cipher key byte-array (16 bytes)
 	 * @return    key schedule as 2D byte-array (Nr+1 x Nb bytes)
 	 */
-	protected static function KeyExpansion($key) {  // generate Key Schedule from Cipher Key [�5.2]
+	protected static function KeyExpansion($key) {  // generate Key Schedule from Cipher Key [�5.2]
 	  $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
 	  $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
 	  $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
@@ -5209,7 +7033,7 @@ public static function AESEncryptCtr($plaintext, $password, $nBits) {
 	  $key = self::Cipher($pwBytes, self::KeyExpansion($pwBytes));
 	  $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
-	  // initialise counter block (NIST SP800-38A �B.2): millisecond time-stamp for nonce in
+	  // initialise counter block (NIST SP800-38A �B.2): millisecond time-stamp for nonce in
 	  // 1st 8 bytes, block counter in 2nd 8 bytes
 	  $counterBlock = array();
 	  $nonce = floor(microtime(true)*1000);   // timestamp: milliseconds since 1-Jan-1970
@@ -5387,8 +7211,19 @@ public static function AESDecryptCBC($ciphertext, $password, $nBits = 128)
 }
 
 /**
- * The Master Setup will read the configuration parameters from restoration.php, abiautomation.ini, or
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The Master Setup will read the configuration parameters from restoration.php or
  * the JSON-encoded "configuration" input variable and return the status.
+ *
  * @return bool True if the master configuration was applied to the Factory object
  */
 function masterSetup()
@@ -5400,26 +7235,29 @@ function masterSetup()
 	$ini_data = null;
 
 	// In restore.php mode, require restoration.php or fail
-	if(!defined('KICKSTART'))
+	if (!defined('KICKSTART'))
 	{
 		// This is the standalone mode, used by Akeeba Backup Professional. It looks for a restoration.php
 		// file to perform its magic. If the file is not there, we will abort.
 		$setupFile = 'restoration.php';
 
-		if( !file_exists($setupFile) )
+		if (!file_exists($setupFile))
 		{
-			// Uh oh... Somebody tried to pooh on our back yard. Lock the gates! Don't let the traitor inside!
 			AKFactory::set('kickstart.enabled', false);
+
 			return false;
 		}
 
 		// Load restoration.php. It creates a global variable named $restoration_setup
 		require_once $setupFile;
+
 		$ini_data = $restoration_setup;
-		if(empty($ini_data))
+
+		if (empty($ini_data))
 		{
 			// No parameters fetched. Darn, how am I supposed to work like that?!
 			AKFactory::set('kickstart.enabled', false);
+
 			return false;
 		}
 
@@ -5429,17 +7267,21 @@ function masterSetup()
 	{
 		// Maybe we have $restoration_setup defined in the head of kickstart.php
 		global $restoration_setup;
-		if(!empty($restoration_setup) && !is_array($restoration_setup)) {
+
+		if (!empty($restoration_setup) && !is_array($restoration_setup))
+		{
 			$ini_data = AKText::parse_ini_file($restoration_setup, false, true);
-		} elseif(is_array($restoration_setup)) {
+		}
+		elseif (is_array($restoration_setup))
+		{
 			$ini_data = $restoration_setup;
 		}
 	}
 
 	// Import any data from $restoration_setup
-	if(!empty($ini_data))
+	if (!empty($ini_data))
 	{
-		foreach($ini_data as $key => $value)
+		foreach ($ini_data as $key => $value)
 		{
 			AKFactory::set($key, $value);
 		}
@@ -5456,89 +7298,126 @@ function masterSetup()
 	// Detect a JSON string in the request variable and store it.
 	$json = getQueryParam('json', null);
 
-	// Remove everything from the request array
-	if(!empty($_REQUEST))
+	// Remove everything from the request, post and get arrays
+	if (!empty($_REQUEST))
 	{
-		foreach($_REQUEST as $key => $value)
+		foreach ($_REQUEST as $key => $value)
 		{
 			unset($_REQUEST[$key]);
 		}
 	}
+
+	if (!empty($_POST))
+	{
+		foreach ($_POST as $key => $value)
+		{
+			unset($_POST[$key]);
+		}
+	}
+
+	if (!empty($_GET))
+	{
+		foreach ($_GET as $key => $value)
+		{
+			unset($_GET[$key]);
+		}
+	}
+
 	// Decrypt a possibly encrypted JSON string
-	if(!empty($json))
+	$password = AKFactory::get('kickstart.security.password', null);
+
+	if (!empty($json))
 	{
-		$password = AKFactory::get('kickstart.security.password', null);
-		if(!empty($password))
+		if (!empty($password))
 		{
 			$json = AKEncryptionAES::AESDecryptCtr($json, $password, 128);
+
+			if (empty($json))
+			{
+				die('###{"status":false,"message":"Invalid login"}###');
+			}
 		}
 
 		// Get the raw data
-		$raw = json_decode( $json, true );
+		$raw = json_decode($json, true);
+
+		if (!empty($password) && (empty($raw)))
+		{
+			die('###{"status":false,"message":"Invalid login"}###');
+		}
+
 		// Pass all JSON data to the request array
-		if(!empty($raw))
+		if (!empty($raw))
 		{
-			foreach($raw as $key => $value)
+			foreach ($raw as $key => $value)
 			{
 				$_REQUEST[$key] = $value;
 			}
 		}
 	}
+	elseif (!empty($password))
+	{
+		die('###{"status":false,"message":"Invalid login"}###');
+	}
 
 	// ------------------------------------------------------------
 	// 3. Try the "factory" variable
 	// ------------------------------------------------------------
 	// A "factory" variable will override all other settings.
 	$serialized = getQueryParam('factory', null);
-	if( !is_null($serialized) )
+
+	if (!is_null($serialized))
 	{
 		// Get the serialized factory
 		AKFactory::unserialize($serialized);
 		AKFactory::set('kickstart.enabled', true);
+
 		return true;
 	}
 
 	// ------------------------------------------------------------
-	// 4. Try abiautomation.ini and the configuration variable for Kickstart
+	// 4. Try the configuration variable for Kickstart
 	// ------------------------------------------------------------
-	if(defined('KICKSTART'))
+	if (defined('KICKSTART'))
 	{
-		// We are in Kickstart mode. abiautomation.ini has precedence.
-		$setupFile = 'abiautomation.ini';
-		if( file_exists($setupFile) )
+		$configuration = getQueryParam('configuration');
+
+		if (!is_null($configuration))
 		{
-			// abiautomation.ini was found
-			$ini_data = AKText::parse_ini_file('restoration.ini', false);
+			// Let's decode the configuration from JSON to array
+			$ini_data = json_decode($configuration, true);
 		}
 		else
 		{
-			// abiautomation.ini was not found. Let's try input parameters.
-			$configuration = getQueryParam('configuration');
-			if( !is_null($configuration) )
-			{
-				// Let's decode the configuration from JSON to array
-				$ini_data = json_decode($configuration, true);
-			}
-			else
-			{
-				// Neither exists. Enable Kickstart's interface anyway.
-				$ini_data = array('kickstart.enabled'=>true);
-			}
+			// Neither exists. Enable Kickstart's interface anyway.
+			$ini_data = array('kickstart.enabled' => true);
 		}
 
 		// Import any INI data we might have from other sources
-		if(!empty($ini_data))
+		if (!empty($ini_data))
 		{
-			foreach($ini_data as $key => $value)
+			foreach ($ini_data as $key => $value)
 			{
 				AKFactory::set($key, $value);
 			}
+
 			AKFactory::set('kickstart.enabled', true);
+
 			return true;
 		}
 	}
 }
 
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2010-2014 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
 // Mini-controller for restore.php
 if(!defined('KICKSTART'))
 {
@@ -5646,11 +7525,33 @@ public function __toString()
 					$postproc->rename( $root.'/htaccess.bak', $root.'/.htaccess' );
 				}
 
+				// Rename htaccess.bak to .htaccess
+				if(file_exists($root.'/web.config.bak'))
+				{
+					if( file_exists($root.'/web.config')  )
+					{
+						$postproc->unlink($root.'/web.config');
+					}
+					$postproc->rename( $root.'/web.config.bak', $root.'/web.config' );
+				}
+
 				// Remove restoration.php
-				$basepath = dirname(__FILE__);
+				$basepath = KSROOTDIR;
 				$basepath = rtrim( str_replace('\\','/',$basepath), '/' );
 				if(!empty($basepath)) $basepath .= '/';
 				$postproc->unlink( $basepath.'restoration.php' );
+
+				// Import a custom finalisation file
+				if (file_exists(dirname(__FILE__) . '/restore_finalisation.php'))
+				{
+					include_once dirname(__FILE__) . '/restore_finalisation.php';
+				}
+
+				// Run a custom finalisation script
+				if (function_exists('finalizeRestore'))
+				{
+					finalizeRestore($root, $basepath);
+				}
 				break;
 
 			default:
@@ -5743,4 +7644,3 @@ function recursive_remove_directory($directory)
 		return TRUE;
 	}
 }
-?>
\ No newline at end of file
diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
index e678b446ae2cf..7265112be5ba1 100644
--- a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
+++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
@@ -62,6 +62,16 @@
 					</a>
 				</td>
 			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL') ?>
+				</td>
+				<td>
+					<a href="<?php echo $this->updateInfo['object']->get('infourl')->_data ?>">
+						<?php echo $this->updateInfo['object']->get('infourl')->title ?>
+					</a>
+				</td>
+			</tr>
 			<tr>
 				<td>
 					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD') ?>
diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php
index 520b4288d5db5..b3d620ce56c16 100644
--- a/administrator/components/com_joomlaupdate/views/default/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/default/view.html.php
@@ -12,8 +12,6 @@
 /**
  * Joomla! Update's Default View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
  * @since       2.5.4
  */
 class JoomlaupdateViewDefault extends JViewLegacy
@@ -29,23 +27,23 @@ class JoomlaupdateViewDefault extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		// Get data from the model
+		// Get data from the model.
 		$this->state = $this->get('State');
 
-		// Load useful classes
+		// Load useful classes.
 		$model = $this->getModel();
 		$this->loadHelper('select');
 
-		// Assign view variables
+		// Assign view variables.
 		$ftp = $model->getFTPOptions();
 		$this->assign('updateInfo', $model->getUpdateInformation());
 		$this->assign('methodSelect', JoomlaupdateHelperSelect::getMethods($ftp['enabled']));
 
-		// Set the toolbar information
+		// Set the toolbar information.
 		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install');
 		JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false, false);
 
-		// Add toolbar buttons
+		// Add toolbar buttons.
 		if (JFactory::getUser()->authorise('core.admin', 'com_joomlaupdate'))
 		{
 			JToolbarHelper::preferences('com_joomlaupdate');
@@ -54,13 +52,13 @@ public function display($tpl = null)
 		JToolBarHelper::divider();
 		JToolBarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');
 
-		// Load mooTools
+		// Load mooTools.
 		JHtml::_('behavior.framework', true);
 
-		// Include jQuery
+		// Include jQuery.
 		JHtml::_('jquery.framework');
 
-		// Load our Javascript
+		// Load our Javascript.
 		$document = JFactory::getDocument();
 		$document->addScript('../media/com_joomlaupdate/default.js');
 		JHtml::_('stylesheet', 'media/mediamanager.css', array(), true);
@@ -71,8 +69,7 @@ public function display($tpl = null)
 			JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'notice');
 		}
 
-		// Render the view
+		// Render the view.
 		parent::display($tpl);
 	}
-
 }
diff --git a/administrator/components/com_joomlaupdate/views/update/view.html.php b/administrator/components/com_joomlaupdate/views/update/view.html.php
index 549978a4fca70..e5687441cc7f1 100644
--- a/administrator/components/com_joomlaupdate/views/update/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/update/view.html.php
@@ -12,16 +12,14 @@
 /**
  * Joomla! Update's Update View
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       2.5.4
+ * @since  2.5.4
  */
 class JoomlaupdateViewUpdate extends JViewLegacy
 {
 	/**
-	 * Renders the view
+	 * Renders the view.
 	 *
-	 * @param   string  $tpl  Template name
+	 * @param   string  $tpl  Template name.
 	 *
 	 * @return void
 	 */
@@ -29,24 +27,24 @@ public function display($tpl=null)
 	{
 		$password = JFactory::getApplication()->getUserState('com_joomlaupdate.password', null);
 		$filesize = JFactory::getApplication()->getUserState('com_joomlaupdate.filesize', null);
-		$ajaxUrl = JUri::base().'components/com_joomlaupdate/restore.php';
+		$ajaxUrl = JUri::base() . 'components/com_joomlaupdate/restore.php';
 		$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise';
 
-		// Set the toolbar information
+		// Set the toolbar information.
 		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install');
 		JToolBarHelper::divider();
 		JToolBarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');
 
-		// Add toolbar buttons
+		// Add toolbar buttons.
 		if (JFactory::getUser()->authorise('core.admin', 'com_joomlaupdate'))
 		{
 			JToolbarHelper::preferences('com_joomlaupdate');
 		}
 
-		// Load mooTools
+		// Load mooTools.
 		JHtml::_('behavior.framework', true);
 
-		// Include jQuery
+		// Include jQuery.
 		JHtml::_('jquery.framework');
 
 		$updateScript = <<<ENDSCRIPT
@@ -57,7 +55,7 @@ public function display($tpl=null)
 
 ENDSCRIPT;
 
-		// Load our Javascript
+		// Load our Javascript.
 		$document = JFactory::getDocument();
 		$document->addScript('../media/com_joomlaupdate/json2.js');
 		$document->addScript('../media/com_joomlaupdate/encryption.js');
@@ -67,8 +65,7 @@ public function display($tpl=null)
 		JHtml::_('stylesheet', 'media/mediamanager.css', array(), true);
 		$document->addScriptDeclaration($updateScript);
 
-		// Render the view
+		// Render the view.
 		parent::display($tpl);
 	}
-
 }
diff --git a/administrator/components/com_languages/controller.php b/administrator/components/com_languages/controller.php
index 78b05db8bc3f4..5ce54503e95d0 100644
--- a/administrator/components/com_languages/controller.php
+++ b/administrator/components/com_languages/controller.php
@@ -12,9 +12,7 @@
 /**
  * Languages Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.5
+ * @since  1.5
  */
 class LanguagesController extends JControllerLegacy
 {
diff --git a/administrator/components/com_languages/controllers/installed.php b/administrator/components/com_languages/controllers/installed.php
index 7e83c4e6abf55..e45292a4bf252 100644
--- a/administrator/components/com_languages/controllers/installed.php
+++ b/administrator/components/com_languages/controllers/installed.php
@@ -12,9 +12,7 @@
 /**
  * Languages Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.5
+ * @since  1.5
  */
 class LanguagesControllerInstalled extends JControllerLegacy
 {
diff --git a/administrator/components/com_languages/controllers/language.php b/administrator/components/com_languages/controllers/language.php
index a55b03e8ff578..5fdb26244463f 100644
--- a/administrator/components/com_languages/controllers/language.php
+++ b/administrator/components/com_languages/controllers/language.php
@@ -12,9 +12,7 @@
 /**
  * Languages list actions controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 class LanguagesControllerLanguage extends JControllerForm
 {
diff --git a/administrator/components/com_languages/controllers/languages.php b/administrator/components/com_languages/controllers/languages.php
index 4a9ee4636eef4..5cb33a3bc9ba3 100644
--- a/administrator/components/com_languages/controllers/languages.php
+++ b/administrator/components/com_languages/controllers/languages.php
@@ -10,9 +10,9 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * Languages controller Class.
+ * 
+ * @since  1.6
  */
 class LanguagesControllerLanguages extends JControllerAdmin
 {
diff --git a/administrator/components/com_languages/controllers/override.php b/administrator/components/com_languages/controllers/override.php
index c25350adcfed6..e5f7ce265583b 100644
--- a/administrator/components/com_languages/controllers/override.php
+++ b/administrator/components/com_languages/controllers/override.php
@@ -12,9 +12,7 @@
 /**
  * Languages Override Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesControllerOverride extends JControllerForm
 {
diff --git a/administrator/components/com_languages/controllers/overrides.php b/administrator/components/com_languages/controllers/overrides.php
index 978f805bd9916..73358a0308059 100644
--- a/administrator/components/com_languages/controllers/overrides.php
+++ b/administrator/components/com_languages/controllers/overrides.php
@@ -12,9 +12,7 @@
 /**
  * Languages Overrides Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesControllerOverrides extends JControllerAdmin
 {
diff --git a/administrator/components/com_languages/controllers/strings.json.php b/administrator/components/com_languages/controllers/strings.json.php
index a77c7ee66b715..1835e623330e2 100644
--- a/administrator/components/com_languages/controllers/strings.json.php
+++ b/administrator/components/com_languages/controllers/strings.json.php
@@ -12,9 +12,7 @@
 /**
  * Languages Strings JSON Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesControllerStrings extends JControllerAdmin
 {
diff --git a/administrator/components/com_languages/helpers/html/languages.php b/administrator/components/com_languages/helpers/html/languages.php
index d6a5acfe7ab8d..9967ce32ed7aa 100644
--- a/administrator/components/com_languages/helpers/html/languages.php
+++ b/administrator/components/com_languages/helpers/html/languages.php
@@ -12,9 +12,7 @@
 /**
  * Utility class working with languages
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlLanguages
 {
diff --git a/administrator/components/com_languages/helpers/jsonresponse.php b/administrator/components/com_languages/helpers/jsonresponse.php
index 585d67787d2e7..cc7e178b45fee 100644
--- a/administrator/components/com_languages/helpers/jsonresponse.php
+++ b/administrator/components/com_languages/helpers/jsonresponse.php
@@ -12,10 +12,8 @@
 /**
  * JSON Response class
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
  * @since       2.5
- * @deprecated	4.0
+ * @deprecated  4.0
  */
 class JJsonResponse
 {
diff --git a/administrator/components/com_languages/helpers/languages.php b/administrator/components/com_languages/helpers/languages.php
index a3d8be5a800fb..b6d7d1ffc945f 100644
--- a/administrator/components/com_languages/helpers/languages.php
+++ b/administrator/components/com_languages/helpers/languages.php
@@ -12,9 +12,7 @@
 /**
  * Languages component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 class LanguagesHelper
 {
diff --git a/administrator/components/com_languages/helpers/multilangstatus.php b/administrator/components/com_languages/helpers/multilangstatus.php
index 232a5f63d392f..5bfa9ff925990 100644
--- a/administrator/components/com_languages/helpers/multilangstatus.php
+++ b/administrator/components/com_languages/helpers/multilangstatus.php
@@ -12,9 +12,7 @@
 /**
  * Multilang status helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.7.1
+ * @since  1.7.1
  */
 abstract class MultilangstatusHelper
 {
diff --git a/administrator/components/com_languages/models/installed.php b/administrator/components/com_languages/models/installed.php
index e26e0371db82d..9f54b9bb57ee6 100644
--- a/administrator/components/com_languages/models/installed.php
+++ b/administrator/components/com_languages/models/installed.php
@@ -12,9 +12,7 @@
 /**
  * Languages Component Languages Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 class LanguagesModelInstalled extends JModelList
 {
diff --git a/administrator/components/com_languages/models/language.php b/administrator/components/com_languages/models/language.php
index b4eed707a9117..9203fe8da2fa9 100644
--- a/administrator/components/com_languages/models/language.php
+++ b/administrator/components/com_languages/models/language.php
@@ -12,9 +12,7 @@
 /**
  * Languages Component Language Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.5
+ * @since  1.5
  */
 class LanguagesModelLanguage extends JModelAdmin
 {
diff --git a/administrator/components/com_languages/models/languages.php b/administrator/components/com_languages/models/languages.php
index 770889f244a6d..59630d1ebaf7e 100644
--- a/administrator/components/com_languages/models/languages.php
+++ b/administrator/components/com_languages/models/languages.php
@@ -12,9 +12,7 @@
 /**
  * Languages Model Class
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 class LanguagesModelLanguages extends JModelList
 {
diff --git a/administrator/components/com_languages/models/override.php b/administrator/components/com_languages/models/override.php
index 53db9c8df7c5f..97f67676f3f49 100644
--- a/administrator/components/com_languages/models/override.php
+++ b/administrator/components/com_languages/models/override.php
@@ -12,9 +12,7 @@
 /**
  * Languages Override Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesModelOverride extends JModelAdmin
 {
diff --git a/administrator/components/com_languages/models/overrides.php b/administrator/components/com_languages/models/overrides.php
index 0849461230a13..dd94544f280e5 100644
--- a/administrator/components/com_languages/models/overrides.php
+++ b/administrator/components/com_languages/models/overrides.php
@@ -12,9 +12,7 @@
 /**
  * Languages Overrides Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesModelOverrides extends JModelList
 {
diff --git a/administrator/components/com_languages/models/strings.php b/administrator/components/com_languages/models/strings.php
index 4f44c401a0307..36bf76eeeb73e 100644
--- a/administrator/components/com_languages/models/strings.php
+++ b/administrator/components/com_languages/models/strings.php
@@ -12,9 +12,7 @@
 /**
  * Languages Strings Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesModelStrings extends JModelLegacy
 {
diff --git a/administrator/components/com_languages/views/installed/view.html.php b/administrator/components/com_languages/views/installed/view.html.php
index b7c1cae18e2a9..c14b9aa00ba63 100644
--- a/administrator/components/com_languages/views/installed/view.html.php
+++ b/administrator/components/com_languages/views/installed/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Displays a list of the installed languages.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 class LanguagesViewInstalled extends JViewLegacy
 {
diff --git a/administrator/components/com_languages/views/language/view.html.php b/administrator/components/com_languages/views/language/view.html.php
index 883a2fad4e21f..40dc9d2202bed 100644
--- a/administrator/components/com_languages/views/language/view.html.php
+++ b/administrator/components/com_languages/views/language/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Languages component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.5
+ * @since  1.5
  */
 class LanguagesViewLanguage extends JViewLegacy
 {
diff --git a/administrator/components/com_languages/views/languages/view.html.php b/administrator/components/com_languages/views/languages/view.html.php
index a55f7b64cb7b4..bb9defa780373 100644
--- a/administrator/components/com_languages/views/languages/view.html.php
+++ b/administrator/components/com_languages/views/languages/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML Languages View class for the Languages component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.6
+ * @since  1.6
  */
 class LanguagesViewLanguages extends JViewLegacy
 {
diff --git a/administrator/components/com_languages/views/multilangstatus/view.html.php b/administrator/components/com_languages/views/multilangstatus/view.html.php
index 56a166110ac23..9e8e98725fe50 100644
--- a/administrator/components/com_languages/views/multilangstatus/view.html.php
+++ b/administrator/components/com_languages/views/multilangstatus/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Displays the multilang status.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       1.7.1
+ * @since  1.7.1
  */
 class LanguagesViewMultilangstatus extends JViewLegacy
 {
diff --git a/administrator/components/com_languages/views/override/view.html.php b/administrator/components/com_languages/views/override/view.html.php
index 681f16300586c..f28001f98bf4d 100644
--- a/administrator/components/com_languages/views/override/view.html.php
+++ b/administrator/components/com_languages/views/override/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit an language override
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesViewOverride extends JViewLegacy
 {
diff --git a/administrator/components/com_languages/views/overrides/view.html.php b/administrator/components/com_languages/views/overrides/view.html.php
index 18932118a039e..f94b9329b4c10 100644
--- a/administrator/components/com_languages/views/overrides/view.html.php
+++ b/administrator/components/com_languages/views/overrides/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View for language overrides list
  *
- * @package     Joomla.Administrator
- * @subpackage  com_languages
- * @since       2.5
+ * @since  2.5
  */
 class LanguagesViewOverrides extends JViewLegacy
 {
diff --git a/administrator/components/com_login/controller.php b/administrator/components/com_login/controller.php
index 73ee4bcebd7ca..ada1c6ef2d9f0 100644
--- a/administrator/components/com_login/controller.php
+++ b/administrator/components/com_login/controller.php
@@ -10,31 +10,29 @@
 defined('_JEXEC') or die;
 
 /**
- * Login Controller
+ * Login Controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_login
- * @since       1.5
+ * @since  1.5
  */
 class LoginController extends JControllerLegacy
 {
 	/**
-	 * Typical view method for MVC based architecture
+	 * Method to display a view.
 	 *
-	 * This function is provide as a default implementation, in most cases
-	 * you will need to override it in your own controllers.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 * @return  JController		This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		// Special treatment is required for this component, as this view may be called
-		// after a session timeout. We must reset the view and layout prior to display
-		// otherwise an error will occur.
-
+		/*
+		 * Special treatment is required for this component, as this view may be called
+		 * after a session timeout. We must reset the view and layout prior to display
+		 * otherwise an error will occur.
+		 */
 		$this->input->set('view', 'login');
 		$this->input->set('layout', 'default');
 
diff --git a/administrator/components/com_login/login.php b/administrator/components/com_login/login.php
index 7572105640d91..5080eeda79b52 100644
--- a/administrator/components/com_login/login.php
+++ b/administrator/components/com_login/login.php
@@ -11,6 +11,7 @@
 
 $input = JFactory::getApplication()->input;
 $task = $input->get('task');
+
 if ($task != 'login' && $task != 'logout')
 {
 	$input->set('task', '');
diff --git a/administrator/components/com_login/models/login.php b/administrator/components/com_login/models/login.php
index 75934dbfaf2a9..634ab9263a0a0 100644
--- a/administrator/components/com_login/models/login.php
+++ b/administrator/components/com_login/models/login.php
@@ -12,9 +12,7 @@
 /**
  * Login Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_login
- * @since       1.5
+ * @since  1.5
  */
 class LoginModelLogin extends JModelLegacy
 {
@@ -41,7 +39,7 @@ protected function populateState()
 		);
 		$this->setState('credentials', $credentials);
 
-		// Check for return URL from the request first
+		// Check for return URL from the request first.
 		if ($return = $input->$method->get('return', '', 'BASE64'))
 		{
 			$return = base64_decode($return);
@@ -62,12 +60,12 @@ protected function populateState()
 	}
 
 	/**
-	 * Get the administrator login module by name (real, eg 'login' or folder, eg 'mod_login')
+	 * Get the administrator login module by name (real, eg 'login' or folder, eg 'mod_login').
 	 *
-	 * @param   string  $name   The name of the module
-	 * @param   string  $title  The title of the module, optional
+	 * @param   string  $name   The name of the module.
+	 * @param   string  $title  The title of the module, optional.
 	 *
-	 * @return  object  The Module object
+	 * @return  object  The Module object.
 	 *
 	 * @since   11.1
 	 */
@@ -79,7 +77,7 @@ public static function getLoginModule($name = 'mod_login', $title = null)
 
 		for ($i = 0; $i < $total; $i++)
 		{
-			// Match the title if we're looking for a specific instance of the module
+			// Match the title if we're looking for a specific instance of the module.
 			if (!$title || $modules[$i]->title == $title)
 			{
 				$result = $modules[$i];
@@ -87,7 +85,7 @@ public static function getLoginModule($name = 'mod_login', $title = null)
 			}
 		}
 
-		// If we didn't find it, and the name is mod_something, create a dummy object
+		// If we didn't find it, and the name is mod_something, create a dummy object.
 		if (is_null($result) && substr($name, 0, 4) == 'mod_')
 		{
 			$result = new stdClass;
@@ -114,7 +112,7 @@ public static function getLoginModule($name = 'mod_login', $title = null)
 	 * This is put in as a failsafe to avoid super user lock out caused by an unpublished
 	 * login module or by a module set to have a viewing access level that is not Public.
 	 *
-	 * @param   string  $module  The name of the module
+	 * @param   string  $module  The name of the module.
 	 *
 	 * @return  array
 	 *
@@ -145,11 +143,10 @@ protected static function _load($module)
 				->select('m.id, m.title, m.module, m.position, m.showtitle, m.params')
 				->from('#__modules AS m')
 				->where('m.module =' . $db->quote($module) . ' AND m.client_id = 1')
-
 				->join('LEFT', '#__extensions AS e ON e.element = m.module AND e.client_id = m.client_id')
 				->where('e.enabled = 1');
 
-			// Filter by language
+			// Filter by language.
 			if ($app->isSite() && $app->getLanguageFilter())
 			{
 				$query->where('m.language IN (' . $db->quote($lang) . ',' . $db->quote('*') . ')');
@@ -157,7 +154,7 @@ protected static function _load($module)
 
 			$query->order('m.position, m.ordering');
 
-			// Set the query
+			// Set the query.
 			$db->setQuery($query);
 
 			try
diff --git a/administrator/components/com_login/views/login/view.html.php b/administrator/components/com_login/views/login/view.html.php
index 09f0949aec481..ff03f2ad379ef 100644
--- a/administrator/components/com_login/views/login/view.html.php
+++ b/administrator/components/com_login/views/login/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Login component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_login
- * @since       1.6
+ * @since  1.6
  */
 class LoginViewLogin extends JViewLegacy
 {
diff --git a/administrator/components/com_media/controller.php b/administrator/components/com_media/controller.php
index 82405c5a0a00a..1d47c69d9cc4a 100644
--- a/administrator/components/com_media/controller.php
+++ b/administrator/components/com_media/controller.php
@@ -12,9 +12,7 @@
 /**
  * Media Manager Component Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.5
+ * @since  1.5
  */
 class MediaController extends JControllerLegacy
 {
diff --git a/administrator/components/com_media/controllers/file.json.php b/administrator/components/com_media/controllers/file.json.php
index fae5c6023acd9..3a4a6f31ddcc0 100644
--- a/administrator/components/com_media/controllers/file.json.php
+++ b/administrator/components/com_media/controllers/file.json.php
@@ -15,9 +15,7 @@
 /**
  * File Media Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.6
+ * @since  1.6
  */
 class MediaControllerFile extends JControllerLegacy
 {
diff --git a/administrator/components/com_media/controllers/file.php b/administrator/components/com_media/controllers/file.php
index 618f964a09148..4316e9c6da2d4 100644
--- a/administrator/components/com_media/controllers/file.php
+++ b/administrator/components/com_media/controllers/file.php
@@ -15,9 +15,7 @@
 /**
  * Media File Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.5
+ * @since  1.5
  */
 class MediaControllerFile extends JControllerLegacy
 {
diff --git a/administrator/components/com_media/controllers/folder.php b/administrator/components/com_media/controllers/folder.php
index b8c1e68de93f4..4541c25610195 100644
--- a/administrator/components/com_media/controllers/folder.php
+++ b/administrator/components/com_media/controllers/folder.php
@@ -15,9 +15,7 @@
 /**
  * Folder Media Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.5
+ * @since  1.5
  */
 class MediaControllerFolder extends JControllerLegacy
 {
diff --git a/administrator/components/com_media/helpers/media.php b/administrator/components/com_media/helpers/media.php
index 6e03d057b928e..43f81894249e9 100644
--- a/administrator/components/com_media/helpers/media.php
+++ b/administrator/components/com_media/helpers/media.php
@@ -10,9 +10,9 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.5
+ * Media helper class.
+ * 
+ * @since       1.6
  * @deprecated  4.0  Use JHelperMedia instead
  */
 abstract class MediaHelper
diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php
index 09fde76aba382..c3e954e3a0abc 100644
--- a/administrator/components/com_media/models/list.php
+++ b/administrator/components/com_media/models/list.php
@@ -15,9 +15,7 @@
 /**
  * Media Component List Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.5
+ * @since  1.5
  */
 class MediaModelList extends JModelLegacy
 {
diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php
index 679f54f21687e..4f3ba450362c0 100644
--- a/administrator/components/com_media/models/manager.php
+++ b/administrator/components/com_media/models/manager.php
@@ -12,9 +12,7 @@
 /**
  * Media Component Manager Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.5
+ * @since  1.5
  */
 class MediaModelManager extends JModelLegacy
 {
@@ -90,7 +88,7 @@ function getFolderList($base = null)
 		// so both string and integer are supported.
 		if ($asset == 0)
 		{
-			$asset = $input->get('asset', 0, 'string');
+			$asset = $input->get('asset', 0, 'cmd');
 		}
 
 		$author = $input->get('author', 0, 'integer');
diff --git a/administrator/components/com_media/views/images/view.html.php b/administrator/components/com_media/views/images/view.html.php
index f2937e091c4a8..038dff873b46d 100644
--- a/administrator/components/com_media/views/images/view.html.php
+++ b/administrator/components/com_media/views/images/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Media component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.0
+ * @since  1.0
  */
 class MediaViewImages extends JViewLegacy
 {
diff --git a/administrator/components/com_media/views/imageslist/view.html.php b/administrator/components/com_media/views/imageslist/view.html.php
index 2647e71729b4f..90d7eb692b73f 100644
--- a/administrator/components/com_media/views/imageslist/view.html.php
+++ b/administrator/components/com_media/views/imageslist/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Media component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.0
+ * @since  1.0
  */
 class MediaViewImagesList extends JViewLegacy
 {
diff --git a/administrator/components/com_media/views/media/view.html.php b/administrator/components/com_media/views/media/view.html.php
index 18d5740ae0928..2e4a8b9520773 100644
--- a/administrator/components/com_media/views/media/view.html.php
+++ b/administrator/components/com_media/views/media/view.html.php
@@ -15,9 +15,7 @@
 /**
  * HTML View class for the Media component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.0
+ * @since  1.0
  */
 class MediaViewMedia extends JViewLegacy
 {
diff --git a/administrator/components/com_media/views/medialist/view.html.php b/administrator/components/com_media/views/medialist/view.html.php
index 6353b325fafc5..c312d462168a8 100644
--- a/administrator/components/com_media/views/medialist/view.html.php
+++ b/administrator/components/com_media/views/medialist/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Media component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_media
- * @since       1.0
+ * @since  1.0
  */
 class MediaViewMediaList extends JViewLegacy
 {
diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php
index 1e88225a6b32c..9aed354640f67 100644
--- a/administrator/components/com_menus/controller.php
+++ b/administrator/components/com_menus/controller.php
@@ -12,9 +12,7 @@
 /**
  * Base controller class for Menu Manager.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusController extends JControllerLegacy
 {
diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php
index 3743d776998a3..28c66f460e3d1 100644
--- a/administrator/components/com_menus/controllers/item.php
+++ b/administrator/components/com_menus/controllers/item.php
@@ -12,9 +12,7 @@
 /**
  * The Menu Item Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusControllerItem extends JControllerForm
 {
diff --git a/administrator/components/com_menus/controllers/items.php b/administrator/components/com_menus/controllers/items.php
index 2f1faf8446b28..0aa210a176fa1 100644
--- a/administrator/components/com_menus/controllers/items.php
+++ b/administrator/components/com_menus/controllers/items.php
@@ -12,9 +12,7 @@
 /**
  * The Menu Item Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusControllerItems extends JControllerAdmin
 {
diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php
index 31e154410e06a..ffd2b253d4231 100644
--- a/administrator/components/com_menus/controllers/menu.php
+++ b/administrator/components/com_menus/controllers/menu.php
@@ -12,9 +12,7 @@
 /**
  * The Menu Type Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusControllerMenu extends JControllerForm
 {
diff --git a/administrator/components/com_menus/controllers/menus.php b/administrator/components/com_menus/controllers/menus.php
index 5ceddda8f8e90..a66d87fe8a822 100644
--- a/administrator/components/com_menus/controllers/menus.php
+++ b/administrator/components/com_menus/controllers/menus.php
@@ -12,9 +12,7 @@
 /**
  * The Menu List Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusControllerMenus extends JControllerLegacy
 {
diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index d522fd8998d9b..7a19d20c11094 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -12,9 +12,7 @@
 /**
  * Menus component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusHelper
 {
diff --git a/administrator/components/com_menus/models/fields/menuordering.php b/administrator/components/com_menus/models/fields/menuordering.php
index 83899d227348f..ea7dffae4c181 100644
--- a/administrator/components/com_menus/models/fields/menuordering.php
+++ b/administrator/components/com_menus/models/fields/menuordering.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldMenuOrdering extends JFormFieldList
 {
diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php
index a96614471f7de..d2d6839c4b4ad 100644
--- a/administrator/components/com_menus/models/fields/menuparent.php
+++ b/administrator/components/com_menus/models/fields/menuparent.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldMenuParent extends JFormFieldList
 {
diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php
index 163803a0db439..d50b0e3352655 100644
--- a/administrator/components/com_menus/models/fields/menutype.php
+++ b/administrator/components/com_menus/models/fields/menutype.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldMenutype extends JFormFieldList
 {
diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php
index ca66ab2d721fe..d14f111556e77 100644
--- a/administrator/components/com_menus/models/item.php
+++ b/administrator/components/com_menus/models/item.php
@@ -15,9 +15,7 @@
 /**
  * Menu Item Model for Menus.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusModelItem extends JModelAdmin
 {
@@ -649,7 +647,8 @@ public function getItem($pk = null)
 			case 'url':
 				$table->component_id = 0;
 
-				parse_str(parse_url($table->link, PHP_URL_QUERY));
+				$args = array();
+				parse_str(parse_url($table->link, PHP_URL_QUERY), $args);
 				break;
 
 			case 'component':
@@ -666,7 +665,7 @@ public function getItem($pk = null)
 					// Load the language file for the component.
 					$lang = JFactory::getLanguage();
 					$lang->load($args['option'], JPATH_ADMINISTRATOR, null, false, true)
-						|| $lang->load($args['option'], JPATH_ADMINISTRATOR . '/components/' . $args['option'], null, false, true);
+					|| $lang->load($args['option'], JPATH_ADMINISTRATOR . '/components/' . $args['option'], null, false, true);
 
 					// Determine the component id.
 					$component = JComponentHelper::getComponent($args['option']);
@@ -702,21 +701,16 @@ public function getItem($pk = null)
 		if ($table->type == 'alias')
 		{
 			// Note that all request arguments become reserved parameter names.
-			$args = array();
-			parse_str(parse_url($table->link, PHP_URL_QUERY), $args);
 			$result->params = array_merge($result->params, $args);
 		}
 
 		if ($table->type == 'url')
 		{
 			// Note that all request arguments become reserved parameter names.
-			$args = array();
-			parse_str(parse_url($table->link, PHP_URL_QUERY), $args);
 			$result->params = array_merge($result->params, $args);
 		}
 
 		// Load associated menu items
-		$app = JFactory::getApplication();
 		$assoc = JLanguageAssociations::isEnabled();
 		if ($assoc)
 		{
@@ -905,8 +899,8 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 
 				// Check for the layout XML file. Use standard xml file if it exists.
 				$tplFolders = array(
-						$base . '/views/' . $view . '/tmpl',
-						$base . '/view/' . $view . '/tmpl'
+					$base . '/views/' . $view . '/tmpl',
+					$base . '/view/' . $view . '/tmpl'
 				);
 				$path = JPath::find($tplFolders, $layout . '.xml');
 
@@ -934,8 +928,8 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 				if (isset($view))
 				{
 					$metadataFolders = array(
-							$base . '/view/' . $view,
-							$base . '/views/' . $view
+						$base . '/view/' . $view,
+						$base . '/views/' . $view
 					);
 					$metaPath = JPath::find($metadataFolders, 'metadata.xml');
 
diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php
index 1f052d02aa4d5..d115cae558666 100644
--- a/administrator/components/com_menus/models/items.php
+++ b/administrator/components/com_menus/models/items.php
@@ -12,9 +12,7 @@
 /**
  * Menu Item List Model for Menus.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusModelItems extends JModelList
 {
diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php
index 76df61056e5a9..6744631324859 100644
--- a/administrator/components/com_menus/models/menu.php
+++ b/administrator/components/com_menus/models/menu.php
@@ -12,9 +12,7 @@
 /**
  * Menu Item Model for Menus.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusModelMenu extends JModelForm
 {
diff --git a/administrator/components/com_menus/models/menus.php b/administrator/components/com_menus/models/menus.php
index 1f753afb85e4e..bd759a95ebade 100644
--- a/administrator/components/com_menus/models/menus.php
+++ b/administrator/components/com_menus/models/menus.php
@@ -12,9 +12,7 @@
 /**
  * Menu List Model for Menus.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusModelMenus extends JModelList
 {
diff --git a/administrator/components/com_menus/models/menutypes.php b/administrator/components/com_menus/models/menutypes.php
index 401b615dda457..20d66ce756384 100644
--- a/administrator/components/com_menus/models/menutypes.php
+++ b/administrator/components/com_menus/models/menutypes.php
@@ -14,9 +14,7 @@
 /**
  * Menu Item Types Model for Menus.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusModelMenutypes extends JModelLegacy
 {
diff --git a/administrator/components/com_menus/tables/menu.php b/administrator/components/com_menus/tables/menu.php
index 0afac7a1e3d6d..506fbcaed2291 100644
--- a/administrator/components/com_menus/tables/menu.php
+++ b/administrator/components/com_menus/tables/menu.php
@@ -12,8 +12,6 @@
 /**
  * Menu table
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
  */
 class MenusTableMenu extends JTableMenu
 {
diff --git a/administrator/components/com_menus/views/item/view.html.php b/administrator/components/com_menus/views/item/view.html.php
index 2c7b8d4d5ee8e..7c5b294d9e416 100644
--- a/administrator/components/com_menus/views/item/view.html.php
+++ b/administrator/components/com_menus/views/item/view.html.php
@@ -12,9 +12,7 @@
 /**
  * The HTML Menus Menu Item View.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusViewItem extends JViewLegacy
 {
diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php
index ee665deeceae5..b0c31c0b56726 100644
--- a/administrator/components/com_menus/views/items/view.html.php
+++ b/administrator/components/com_menus/views/items/view.html.php
@@ -12,9 +12,7 @@
 /**
  * The HTML Menus Menu Items View.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusViewItems extends JViewLegacy
 {
diff --git a/administrator/components/com_menus/views/menu/view.html.php b/administrator/components/com_menus/views/menu/view.html.php
index 5f2cbf4bad242..9787fe181b21f 100644
--- a/administrator/components/com_menus/views/menu/view.html.php
+++ b/administrator/components/com_menus/views/menu/view.html.php
@@ -12,9 +12,7 @@
 /**
  * The HTML Menus Menu Item View.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusViewMenu extends JViewLegacy
 {
diff --git a/administrator/components/com_menus/views/menus/view.html.php b/administrator/components/com_menus/views/menus/view.html.php
index 3b89d1cb457a5..51180be0c8452 100644
--- a/administrator/components/com_menus/views/menus/view.html.php
+++ b/administrator/components/com_menus/views/menus/view.html.php
@@ -12,9 +12,7 @@
 /**
  * The HTML Menus Menu Menus View.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusViewMenus extends JViewLegacy
 {
diff --git a/administrator/components/com_menus/views/menutypes/view.html.php b/administrator/components/com_menus/views/menutypes/view.html.php
index 8376f4d4f7eec..67cebd9197d9a 100644
--- a/administrator/components/com_menus/views/menutypes/view.html.php
+++ b/administrator/components/com_menus/views/menutypes/view.html.php
@@ -12,9 +12,7 @@
 /**
  * The HTML Menus Menu Item TYpes View.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_menus
- * @since       1.6
+ * @since  1.6
  */
 class MenusViewMenutypes extends JViewLegacy
 {
diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php
index 7b0e3aa2a3f3c..64937e2f098ce 100644
--- a/administrator/components/com_messages/controller.php
+++ b/administrator/components/com_messages/controller.php
@@ -12,9 +12,7 @@
 /**
  * Messages master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesController extends JControllerLegacy
 {
diff --git a/administrator/components/com_messages/controllers/config.php b/administrator/components/com_messages/controllers/config.php
index 59deec7272495..e7f7f04ca2721 100644
--- a/administrator/components/com_messages/controllers/config.php
+++ b/administrator/components/com_messages/controllers/config.php
@@ -12,9 +12,7 @@
 /**
  * Messages Component Message Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesControllerConfig extends JControllerLegacy
 {
diff --git a/administrator/components/com_messages/controllers/message.php b/administrator/components/com_messages/controllers/message.php
index 8c0dc090a1bd2..3b1624977f04a 100644
--- a/administrator/components/com_messages/controllers/message.php
+++ b/administrator/components/com_messages/controllers/message.php
@@ -12,9 +12,7 @@
 /**
  * Messages Component Message Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesControllerMessage extends JControllerForm
 {
diff --git a/administrator/components/com_messages/controllers/messages.php b/administrator/components/com_messages/controllers/messages.php
index faeada02c3745..5c1fd89fb81e7 100644
--- a/administrator/components/com_messages/controllers/messages.php
+++ b/administrator/components/com_messages/controllers/messages.php
@@ -12,9 +12,7 @@
 /**
  * Messages list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesControllerMessages extends JControllerAdmin
 {
diff --git a/administrator/components/com_messages/helpers/html/messages.php b/administrator/components/com_messages/helpers/html/messages.php
index 2e78db3514f40..8163af454b28e 100644
--- a/administrator/components/com_messages/helpers/html/messages.php
+++ b/administrator/components/com_messages/helpers/html/messages.php
@@ -10,9 +10,9 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * JHtml administrator messages class.
+ *
+ * @since  1.6
  */
 class JHtmlMessages
 {
diff --git a/administrator/components/com_messages/helpers/messages.php b/administrator/components/com_messages/helpers/messages.php
index f8689c8b9a3f9..9708ead5b6a5f 100644
--- a/administrator/components/com_messages/helpers/messages.php
+++ b/administrator/components/com_messages/helpers/messages.php
@@ -10,9 +10,9 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * Messages helper class.
+ *
+ * @since  1.6
  */
 class MessagesHelper
 {
diff --git a/administrator/components/com_messages/models/config.php b/administrator/components/com_messages/models/config.php
index b6e2ed1cab906..e38a189e20148 100644
--- a/administrator/components/com_messages/models/config.php
+++ b/administrator/components/com_messages/models/config.php
@@ -12,9 +12,7 @@
 /**
  * Message configuration model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesModelConfig extends JModelForm
 {
diff --git a/administrator/components/com_messages/models/fields/usermessages.php b/administrator/components/com_messages/models/fields/usermessages.php
index aaf82db7e4a38..612cd92bb8347 100644
--- a/administrator/components/com_messages/models/fields/usermessages.php
+++ b/administrator/components/com_messages/models/fields/usermessages.php
@@ -14,9 +14,7 @@
 /**
  * Supports an modal select of user that have access to com_messages
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldUserMessages extends JFormFieldUser
 {
diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php
index 039eb1e52f577..6e12257076fe2 100644
--- a/administrator/components/com_messages/models/message.php
+++ b/administrator/components/com_messages/models/message.php
@@ -12,9 +12,7 @@
 /**
  * Private Message model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesModelMessage extends JModelAdmin
 {
diff --git a/administrator/components/com_messages/models/messages.php b/administrator/components/com_messages/models/messages.php
index 02580e15f175a..044860dae24fa 100644
--- a/administrator/components/com_messages/models/messages.php
+++ b/administrator/components/com_messages/models/messages.php
@@ -12,9 +12,7 @@
 /**
  * Messages Component Messages Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesModelMessages extends JModelList
 {
diff --git a/administrator/components/com_messages/tables/message.php b/administrator/components/com_messages/tables/message.php
index 14b54f57e465c..e657b64c80582 100644
--- a/administrator/components/com_messages/tables/message.php
+++ b/administrator/components/com_messages/tables/message.php
@@ -12,9 +12,7 @@
 /**
  * Message Table class
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.5
+ * @since  1.5
  */
 class MessagesTableMessage extends JTable
 {
diff --git a/administrator/components/com_messages/views/config/view.html.php b/administrator/components/com_messages/views/config/view.html.php
index e94a1b65404b6..e872ae46087b6 100644
--- a/administrator/components/com_messages/views/config/view.html.php
+++ b/administrator/components/com_messages/views/config/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit messages user configuration.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesViewConfig extends JViewLegacy
 {
diff --git a/administrator/components/com_messages/views/message/view.html.php b/administrator/components/com_messages/views/message/view.html.php
index 5b537d0d13fd7..6ad6d12a7da33 100644
--- a/administrator/components/com_messages/views/message/view.html.php
+++ b/administrator/components/com_messages/views/message/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Messages component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesViewMessage extends JViewLegacy
 {
diff --git a/administrator/components/com_messages/views/messages/view.html.php b/administrator/components/com_messages/views/messages/view.html.php
index 2f01331926b78..ec6ed8d7d4f69 100644
--- a/administrator/components/com_messages/views/messages/view.html.php
+++ b/administrator/components/com_messages/views/messages/view.html.php
@@ -13,9 +13,7 @@
 /**
  * View class for a list of messages.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_messages
- * @since       1.6
+ * @since  1.6
  */
 class MessagesViewMessages extends JViewLegacy
 {
diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php
index 5412d518919d2..0861f618c3574 100644
--- a/administrator/components/com_modules/controller.php
+++ b/administrator/components/com_modules/controller.php
@@ -12,25 +12,23 @@
 /**
  * Modules manager master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesController extends JControllerLegacy
 {
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean         $cachable       If true, the view output will be cached
-	 * @param   array|boolean   $urlparams      An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}
-	.
+	 * @param   boolean        $cachable   If true, the view output will be cached
+	 * @param   array|boolean  $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}
+	 *
+	 * @return  JController    This object to support chaining.
 	 *
-	 * @return  JController        This object to support chaining.
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		require_once JPATH_COMPONENT.'/helpers/modules.php';
+		require_once JPATH_COMPONENT . '/helpers/modules.php';
 
 		// Load the submenu.
 		ModulesHelper::addSubmenu($this->input->get('view', 'modules'));
diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php
index b24a821ce4fa0..33efd5d105a6e 100644
--- a/administrator/components/com_modules/controllers/module.php
+++ b/administrator/components/com_modules/controllers/module.php
@@ -12,9 +12,7 @@
 /**
  * Module controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesControllerModule extends JControllerForm
 {
@@ -31,6 +29,7 @@ public function add()
 
 		// Get the result of the parent method. If an error, just return it.
 		$result = parent::add();
+
 		if ($result instanceof Exception)
 		{
 			return $result;
@@ -38,9 +37,13 @@ public function add()
 
 		// Look for the Extension ID.
 		$extensionId = $app->input->get('eid', 0, 'int');
+
 		if (empty($extensionId))
 		{
-			$this->setRedirect(JRoute::_('index.php?option='.$this->option.'&view='.$this->view_item.'&layout=edit', false));
+			$redirectUrl = 'index.php?option=' . $this->option . '&view=' . $this->view_item . '&layout=edit';
+
+			$this->setRedirect(JRoute::_($redirectUrl, false));
+
 			return JError::raiseWarning(500, JText::_('COM_MODULES_ERROR_INVALID_EXTENSION'));
 		}
 
@@ -85,7 +88,7 @@ public function cancel($key = null)
 	 */
 	protected function allowSave($data, $key = 'id')
 	{
-		// use custom position if selected
+		// Use custom position if selected
 		if (isset($data['custom_position']))
 		{
 			if (empty($data['position']))
@@ -143,7 +146,9 @@ public function batch($model = null)
 		$model	= $this->getModel('Module', '', array());
 
 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_modules&view=modules'.$this->getRedirectToListAppend(), false));
+		$redirectUrl = 'index.php?option=com_modules&view=modules' . $this->getRedirectToListAppend();
+
+		$this->setRedirect(JRoute::_($redirectUrl, false));
 
 		return parent::batch($model);
 	}
diff --git a/administrator/components/com_modules/controllers/modules.php b/administrator/components/com_modules/controllers/modules.php
index cf55d57c8025d..2a472eb3495cc 100644
--- a/administrator/components/com_modules/controllers/modules.php
+++ b/administrator/components/com_modules/controllers/modules.php
@@ -12,14 +12,15 @@
 /**
  * Modules list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesControllerModules extends JControllerAdmin
 {
 	/**
 	 * Method to clone an existing module.
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function duplicate()
@@ -30,15 +31,18 @@ public function duplicate()
 		$pks = $this->input->post->get('cid', array(), 'array');
 		JArrayHelper::toInteger($pks);
 
-		try {
+		try
+		{
 			if (empty($pks))
 			{
 				throw new Exception(JText::_('COM_MODULES_ERROR_NO_MODULES_SELECTED'));
 			}
+
 			$model = $this->getModel();
 			$model->duplicate($pks);
 			$this->setMessage(JText::plural('COM_MODULES_N_MODULES_DUPLICATED', count($pks)));
-		} catch (Exception $e)
+		}
+		catch (Exception $e)
 		{
 			JError::raiseWarning(500, $e->getMessage());
 		}
@@ -60,6 +64,7 @@ public function duplicate()
 	public function getModel($name = 'Module', $prefix = 'ModulesModel', $config = array('ignore_request' => true))
 	{
 		$model = parent::getModel($name, $prefix, $config);
+
 		return $model;
 	}
 }
diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php
index a165608fb2b49..e710628a30eff 100644
--- a/administrator/components/com_modules/helpers/html/modules.php
+++ b/administrator/components/com_modules/helpers/html/modules.php
@@ -9,10 +9,10 @@
 
 defined('_JEXEC') or die;
 
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+/** 
+ * JHtml module helper class.
+ *
+ * @since  1.6
  */
 abstract class JHtmlModules
 {
@@ -146,19 +146,24 @@ public static function positions($clientId, $state = 1, $selectedPosition = '')
 
 		// Add positions from templates
 		$isTemplatePosition = false;
+
 		foreach ($templates as $template)
 		{
 			$options = array();
 
 			$positions = TemplatesHelper::getPositions($clientId, $template);
-			if (is_array($positions)) foreach ($positions as $position)
-			{
-				$text = ModulesHelper::getTranslatedModulePosition($clientId, $template, $position) . ' [' . $position . ']';
-				$options[] = ModulesHelper::createOption($position, $text);
 
-				if (!$isTemplatePosition && $selectedPosition === $position)
+			if (is_array($positions))
+			{
+				foreach ($positions as $position)
 				{
-					$isTemplatePosition = true;
+					$text = ModulesHelper::getTranslatedModulePosition($clientId, $template, $position) . ' [' . $position . ']';
+					$options[] = ModulesHelper::createOption($position, $text);
+
+					if (!$isTemplatePosition && $selectedPosition === $position)
+					{
+						$isTemplatePosition = true;
+					}
 				}
 			}
 
@@ -175,6 +180,11 @@ public static function positions($clientId, $state = 1, $selectedPosition = '')
 		return $templateGroups;
 	}
 
+	/**
+	 * Get a select with the batch action options
+	 *
+	 * @return  void
+	 */
 	public static function batchOptions()
 	{
 		// Create the copy/move options.
diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php
index 6c4047f1293e8..83b1038c4eba5 100644
--- a/administrator/components/com_modules/helpers/modules.php
+++ b/administrator/components/com_modules/helpers/modules.php
@@ -12,9 +12,7 @@
 /**
  * Modules component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 abstract class ModulesHelper
 {
@@ -22,6 +20,8 @@ abstract class ModulesHelper
 	 * Configure the Linkbar.
 	 *
 	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
 	 */
 	public static function addSubmenu($vName)
 	{
@@ -31,7 +31,7 @@ public static function addSubmenu($vName)
 	/**
 	 * Gets a list of the actions that can be performed.
 	 *
-	 * @param   integer  The module ID.
+	 * @param   integer  $moduleId  The module ID.
 	 *
 	 * @return  JObject
 	 *
@@ -67,6 +67,7 @@ public static function getStateOptions()
 		$options[]	= JHtml::_('select.option',	'1',	JText::_('JPUBLISHED'));
 		$options[]	= JHtml::_('select.option',	'0',	JText::_('JUNPUBLISHED'));
 		$options[]	= JHtml::_('select.option',	'-2',	JText::_('JTRASHED'));
+
 		return $options;
 	}
 
@@ -81,13 +82,15 @@ public static function getClientOptions()
 		$options	= array();
 		$options[]	= JHtml::_('select.option', '0', JText::_('JSITE'));
 		$options[]	= JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+
 		return $options;
 	}
 
 	/**
 	 * Get a list of modules positions
 	 *
-	 * @param   integer  $clientId  Client ID
+	 * @param   integer  $clientId       Client ID
+	 * @param   boolean  $editPositions  Allow to edit the positions
 	 *
 	 * @return  array  A list of positions
 	 */
@@ -110,23 +113,25 @@ public static function getPositions($clientId, $editPositions = false)
 		catch (RuntimeException $e)
 		{
 			JError::raiseWarning(500, $e->getMessage());
+
 			return;
 		}
 
 		// Build the list
 		$options = array();
+
 		foreach ($positions as $position)
 		{
 			if (!$position && !$editPositions)
 			{
 				$options[]	= JHtml::_('select.option', 'none', ':: ' . JText::_('JNONE') . ' ::');
-
 			}
 			else
 			{
 				$options[]	= JHtml::_('select.option', $position, $position);
 			}
 		}
+
 		return $options;
 	}
 
@@ -151,6 +156,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
 			->from('#__extensions')
 			->where('client_id = ' . (int) $clientId)
 			->where('type = ' . $db->quote('template'));
+
 		if ($state != '')
 		{
 			$query->where('enabled = ' . $db->quote($state));
@@ -164,6 +170,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
 		// Set the query and load the templates.
 		$db->setQuery($query);
 		$templates = $db->loadObjectList('element');
+
 		return $templates;
 	}
 
@@ -199,7 +206,9 @@ public static function getModules($clientId)
 			||	$lang->load("$extension.sys", $source, null, false, true);
 			$modules[$i]->text = JText::_($module->text);
 		}
+
 		JArrayHelper::sortObjects($modules, 'text', 1, true, true);
+
 		return $modules;
 	}
 
@@ -228,8 +237,9 @@ public static function getAssignmentOptions($clientId)
 	/**
 	 * Return a translated module position name
 	 *
-	 * @param   string  $template  Template name
-	 * @param   string  $position  Position name
+	 * @param   integer  $clientId  Application client id 0: site | 1: admin
+	 * @param   string   $template  Template name
+	 * @param   string   $position  Position name
 	 *
 	 * @return  string  Return a translated position name
 	 *
@@ -241,10 +251,10 @@ public static function getTranslatedModulePosition($clientId, $template, $positi
 		$lang = JFactory::getLanguage();
 		$path = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
 
-		$lang->load('tpl_'.$template.'.sys', $path, null, false, false)
-		||	$lang->load('tpl_'.$template.'.sys', $path.'/templates/'.$template, null, false, false)
-		||	$lang->load('tpl_'.$template.'.sys', $path, $lang->getDefault(), false, false)
-		||	$lang->load('tpl_'.$template.'.sys', $path.'/templates/'.$template, $lang->getDefault(), false, false);
+		$lang->load('tpl_' . $template . '.sys', $path, null, false, false)
+		||	$lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, null, false, false)
+		||	$lang->load('tpl_' . $template . '.sys', $path, $lang->getDefault(), false, false)
+		||	$lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, $lang->getDefault(), false, false);
 
 		$langKey = strtoupper('TPL_' . $template . '_POSITION_' . $position);
 		$text = JText::_($langKey);
diff --git a/administrator/components/com_modules/helpers/xml.php b/administrator/components/com_modules/helpers/xml.php
index a955fb3435d89..9df1cba180a11 100644
--- a/administrator/components/com_modules/helpers/xml.php
+++ b/administrator/components/com_modules/helpers/xml.php
@@ -14,15 +14,20 @@
 /**
  * Helper for parse XML module files
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
  * @since       1.5
  * @deprecated  3.2  Do not use.
  */
 class ModulesHelperXML
 {
 	/**
+	 * Parse the module XML file
+	 *
+	 * @param   array  &$rows  XML rows
+	 *
+	 * @return  void
+	 *
 	 * @since       1.5
+	 *
 	 * @deprecated  3.2  Do not use.
 	 */
 	public function parseXMLModuleFile(&$rows)
diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
index d014d0e8ccd3b..88f370ae45c59 100644
--- a/administrator/components/com_modules/models/module.php
+++ b/administrator/components/com_modules/models/module.php
@@ -12,9 +12,7 @@
 /**
  * Module model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesModelModule extends JModelAdmin
 {
@@ -93,6 +91,7 @@ public function batch($commands, $pks, $contexts)
 		if (empty($pks))
 		{
 			$this->setError(JText::_('JGLOBAL_NO_ITEM_SELECTED'));
+
 			return false;
 		}
 
@@ -107,6 +106,7 @@ public function batch($commands, $pks, $contexts)
 				if ($cmd == 'c')
 				{
 					$result = $this->batchCopy($commands['position_id'], $pks, $contexts);
+
 					if (is_array($result))
 					{
 						$pks = $result;
@@ -120,6 +120,7 @@ public function batch($commands, $pks, $contexts)
 				{
 					return false;
 				}
+
 				$done = true;
 			}
 		}
@@ -147,6 +148,7 @@ public function batch($commands, $pks, $contexts)
 		if (!$done)
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+
 			return false;
 		}
 
@@ -195,6 +197,7 @@ protected function batchCopy($value, $pks, $contexts)
 				{
 					$position = $value;
 				}
+
 				$table->position = $position;
 
 				// Alter the title if necessary
@@ -210,6 +213,7 @@ protected function batchCopy($value, $pks, $contexts)
 				if (!$table->store())
 				{
 					$this->setError($table->getError());
+
 					return false;
 				}
 
@@ -243,6 +247,7 @@ protected function batchCopy($value, $pks, $contexts)
 			else
 			{
 				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
+
 				return false;
 			}
 		}
@@ -290,6 +295,7 @@ protected function batchMove($value, $pks, $contexts)
 				{
 					$position = $value;
 				}
+
 				$table->position = $position;
 
 				// Alter the title if necessary
@@ -302,12 +308,14 @@ protected function batchMove($value, $pks, $contexts)
 				if (!$table->store())
 				{
 					$this->setError($table->getError());
+
 					return false;
 				}
 			}
 			else
 			{
 				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
 				return false;
 			}
 		}
@@ -321,9 +329,10 @@ protected function batchMove($value, $pks, $contexts)
 	/**
 	 * Method to test whether a record can have its state edited.
 	 *
-	 * @param   object    $record    A record object.
+	 * @param   object  $record  A record object.
 	 *
 	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
 	 * @since   3.2
 	 */
 	protected function canEditState($record)
@@ -364,9 +373,10 @@ public function delete(&$pks)
 			if ($table->load($pk))
 			{
 				// Access checks.
-				if (!$user->authorise('core.delete', 'com_modules.module.'.(int) $pk) || $table->published != -2)
+				if (!$user->authorise('core.delete', 'com_modules.module.' . (int) $pk) || $table->published != -2)
 				{
 					JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+
 					return;
 				}
 
@@ -432,6 +442,7 @@ public function duplicate(&$pks)
 
 				// Alter the title.
 				$m = null;
+
 				if (preg_match('#\((\d+)\)$#', $table->title, $m))
 				{
 					$table->title = preg_replace('#\(\d+\)$#', '(' . ($m[1] + 1) . ')', $table->title);
@@ -508,6 +519,7 @@ protected function generateNewTitle($category_id, $title, $position)
 	{
 		// Alter the title & alias
 		$table = $this->getTable();
+
 		while ($table->load(array('position' => $position, 'title' => $title)))
 		{
 			$title = JString::increment($title);
@@ -561,6 +573,7 @@ public function getForm($data = array(), $loadData = true)
 
 		// Get the form.
 		$form = $this->loadForm('com_modules.module', 'module', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -570,11 +583,12 @@ public function getForm($data = array(), $loadData = true)
 
 		$user = JFactory::getUser();
 
-		// Check for existing module
-		// Modify the form based on Edit State access controls.
-		if ($id != 0 && (!$user->authorise('core.edit.state', 'com_modules.module.'.(int) $id))
-			|| ($id == 0 && !$user->authorise('core.edit.state', 'com_modules'))
-		)
+		/**
+		 * Check for existing module
+		 * Modify the form based on Edit State access controls.
+		 */
+		if ($id != 0 && (!$user->authorise('core.edit.state', 'com_modules.module.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('core.edit.state', 'com_modules'))		)
 		{
 			// Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
@@ -613,6 +627,7 @@ protected function loadFormData()
 
 			// This allows us to inject parameter settings into a new module.
 			$params = $app->getUserState('com_modules.add.module.params');
+
 			if (is_array($params))
 			{
 				$data->set('params', $params);
@@ -848,6 +863,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 
 			// Get the help data from the XML file if present.
 			$help = $xml->xpath('/extension/help');
+
 			if (!empty($help))
 			{
 				$helpKey = trim((string) $help[0]['key']);
@@ -856,7 +872,6 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 				$this->helpKey = $helpKey ? $helpKey : $this->helpKey;
 				$this->helpURL = $helpURL ? $helpURL : $this->helpURL;
 			}
-
 		}
 
 		// Load the default advanced params
@@ -916,7 +931,7 @@ public function save($data)
 		if ($input->get('task') == 'save2copy')
 		{
 			$orig_data  = $input->post->get('jform', array(), 'array');
-			$orig_table = clone($this->getTable());
+			$orig_table = clone $this->getTable();
 			$orig_table->load((int) $orig_data['id']);
 
 			if ($data['title'] == $orig_table->title)
diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php
index 843166a76b51c..85551357ef63b 100644
--- a/administrator/components/com_modules/models/modules.php
+++ b/administrator/components/com_modules/models/modules.php
@@ -12,16 +12,15 @@
 /**
  * Modules Component Module Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.5
+ * @since  1.5
  */
 class ModulesModelModules extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -56,6 +55,11 @@ public function __construct($config = array())
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -80,11 +84,13 @@ protected function populateState($ordering = null, $direction = null)
 
 		$clientId = $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', 0, 'int', false);
 		$previousId = $app->getUserState($this->context . '.filter.client_id_previous', null);
+
 		if ($previousId != $clientId || $previousId === null)
 		{
 			$this->getUserStateFromRequest($this->context . '.filter.client_id_previous', 'filter_client_id_previous', 0, 'int', true);
 			$app->setUserState($this->context . '.filter.client_id_previous', $clientId);
 		}
+
 		$this->setState('filter.client_id', $clientId);
 
 		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
@@ -105,7 +111,7 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string    A store id.
 	 */
@@ -126,14 +132,16 @@ protected function getStoreId($id = '')
 	/**
 	 * Returns an object list
 	 *
-	 * @param   string The query
-	 * @param   int    Offset
-	 * @param   int    The number of records
+	 * @param   string  $query       The query
+	 * @param   int     $limitstart  Offset
+	 * @param   int     $limit       The number of records
+	 *
 	 * @return  array
 	 */
 	protected function _getList($query, $limitstart = 0, $limit = 0)
 	{
 		$ordering = $this->getState('list.ordering', 'ordering');
+
 		if (in_array($ordering, array('pages', 'name')))
 		{
 			$this->_db->setQuery($query);
@@ -142,11 +150,13 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
 			JArrayHelper::sortObjects($result, $ordering, $this->getState('list.direction') == 'desc' ? -1 : 1, true, true);
 			$total = count($result);
 			$this->cache[$this->getStoreId('getTotal')] = $total;
+
 			if ($total < $limitstart)
 			{
 				$limitstart = 0;
 				$this->setState('list.start', 0);
 			}
+
 			return array_slice($result, $limitstart, $limit ? $limit : null);
 		}
 		else
@@ -156,17 +166,22 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
 				$query->order('a.position ASC');
 				$ordering = 'a.ordering';
 			}
+
 			if ($ordering == 'language_title')
 			{
 				$ordering = 'l.title';
 			}
+
 			$query->order($this->_db->quoteName($ordering) . ' ' . $this->getState('list.direction'));
+
 			if ($ordering == 'position')
 			{
 				$query->order('a.ordering ASC');
 			}
+
 			$result = parent::_getList($query, $limitstart, $limit);
 			$this->translate($result);
+
 			return $result;
 		}
 	}
@@ -174,7 +189,8 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
 	/**
 	 * Translate a list of objects
 	 *
-	 * @param   array The array of objects
+	 * @param   array  &$items  The array of objects
+	 *
 	 * @return  array The array of translated objects
 	 */
 	protected function translate(&$items)
@@ -189,6 +205,7 @@ protected function translate(&$items)
 			$lang->load("$extension.sys", constant('JPATH_' . strtoupper($client)), null, false, true)
 				|| $lang->load("$extension.sys", $source, null, false, true);
 			$item->name = JText::_($item->name);
+
 			if (is_null($item->pages))
 			{
 				$item->pages = JText::_('JNONE');
@@ -262,6 +279,7 @@ protected function getListQuery()
 
 		// Filter by published state
 		$state = $this->getState('filter.state');
+
 		if (is_numeric($state))
 		{
 			$query->where('a.published = ' . (int) $state);
@@ -273,6 +291,7 @@ protected function getListQuery()
 
 		// Filter by position
 		$position = $this->getState('filter.position');
+
 		if ($position && $position != 'none')
 		{
 			$query->where('a.position = ' . $db->quote($position));
@@ -285,6 +304,7 @@ protected function getListQuery()
 
 		// Filter by module
 		$module = $this->getState('filter.module');
+
 		if ($module)
 		{
 			$query->where('a.module = ' . $db->quote($module));
@@ -292,6 +312,7 @@ protected function getListQuery()
 
 		// Filter by client.
 		$clientId = $this->getState('filter.client_id');
+
 		if (is_numeric($clientId))
 		{
 			$query->where('a.client_id = ' . (int) $clientId . ' AND e.client_id =' . (int) $clientId);
@@ -299,6 +320,7 @@ protected function getListQuery()
 
 		// Filter by search in title
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -318,7 +340,6 @@ protected function getListQuery()
 			$query->where('a.language = ' . $db->quote($language));
 		}
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 }
diff --git a/administrator/components/com_modules/models/positions.php b/administrator/components/com_modules/models/positions.php
index dcc85d7ff8aa7..ca7fcab7aef45 100644
--- a/administrator/components/com_modules/models/positions.php
+++ b/administrator/components/com_modules/models/positions.php
@@ -12,16 +12,14 @@
 /**
  * Modules Component Positions Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesModelPositions extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
 	 * @see     JController
 	 * @since   1.6
@@ -44,6 +42,11 @@ public function __construct($config = array())
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -104,6 +107,7 @@ public function getItems()
 					->select('DISTINCT(position) as value')
 					->from('#__modules')
 					->where($this->_db->quoteName('client_id') . ' = ' . (int) $clientId);
+
 				if ($search)
 				{
 					$search = $this->_db->quote('%' . str_replace(' ', '%', $this->_db->escape(trim($search), true) . '%'));
@@ -141,10 +145,12 @@ public function getItems()
 				if (file_exists($path))
 				{
 					$xml = simplexml_load_file($path);
+
 					if (isset($xml->positions[0]))
 					{
 						$lang->load('tpl_' . $template->element . '.sys', $client->path, null, false, true)
 						|| $lang->load('tpl_' . $template->element . '.sys', $client->path . '/templates/' . $template->element, null, false, true);
+
 						foreach ($xml->positions[0] as $position)
 						{
 							$value = (string) $position['value'];
@@ -161,6 +167,7 @@ public function getItems()
 									$label = $altlabel;
 								}
 							}
+
 							if ($type == 'user' || ($state != '' && $state != $template->enabled))
 							{
 								unset($positions[$value]);
@@ -171,12 +178,14 @@ public function getItems()
 								{
 									$positions[$value] = array();
 								}
+
 								$positions[$value][$template->name] = $label;
 							}
 						}
 					}
 				}
 			}
+
 			$this->total = count($positions);
 
 			if ($limitstart >= $this->total)
@@ -207,6 +216,7 @@ public function getItems()
 					arsort($positions);
 				}
 			}
+
 			$this->items = array_slice($positions, $limitstart, $limit ? $limit : null);
 		}
 
diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php
index 00977bab34ecc..8afe3203bff7f 100644
--- a/administrator/components/com_modules/models/select.php
+++ b/administrator/components/com_modules/models/select.php
@@ -12,9 +12,7 @@
 /**
  * Module model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesModelSelect extends JModelList
 {
@@ -23,6 +21,11 @@ class ModulesModelSelect extends JModelList
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -51,7 +54,7 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string    A store id.
 	 */
@@ -96,7 +99,6 @@ protected function getListQuery()
 		// Add the list ordering clause.
 		$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 
@@ -118,6 +120,7 @@ public function getItems()
 		foreach ($items as &$item)
 		{
 			$path = JPath::clean($client->path . '/modules/' . $item->module . '/' . $item->module . '.xml');
+
 			if (file_exists($path))
 			{
 				$item->xml = simplexml_load_file($path);
@@ -142,6 +145,7 @@ public function getItems()
 				$item->desc = JText::_('COM_MODULES_NODESCRIPTION');
 			}
 		}
+
 		$items = JArrayHelper::sortObjects($items, 'name', 1, true, true);
 
 		// TODO: Use the cached XML from the extensions table?
diff --git a/administrator/components/com_modules/views/module/view.html.php b/administrator/components/com_modules/views/module/view.html.php
index 2f5bffda919b0..e8b2fa6bfe325 100644
--- a/administrator/components/com_modules/views/module/view.html.php
+++ b/administrator/components/com_modules/views/module/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a module.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesViewModule extends JViewLegacy
 {
@@ -26,6 +24,10 @@ class ModulesViewModule extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -38,6 +40,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -48,6 +51,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -101,6 +106,7 @@ protected function addToolbar()
 		$lang = JFactory::getLanguage();
 
 		$help = $this->get('Help');
+
 		if ($lang->hasKey($help->url))
 		{
 			$debug = $lang->setDebug(false);
@@ -111,6 +117,7 @@ protected function addToolbar()
 		{
 			$url = null;
 		}
+
 		JToolbarHelper::help($help->key, false, $url);
 	}
 }
diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php
index 251cb6da206d5..cb58c064c9ed6 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default.php
@@ -159,7 +159,7 @@
 					</td>
 					<td class="center">
 						<div class="btn-group">
-							<?php echo JHtml::_('modules.state', $item->published, $i, $canChange, 'cb'); ?>
+							<?php echo JHtml::_('jgrid.published', $item->published, $i, 'modules.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
 							<?php
 								// Create dropdown items
 								JHtml::_('actionsdropdown.duplicate', 'cb' . $i, 'modules');
@@ -238,4 +238,4 @@
 		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php
index c4144516e3cc4..c3de464cf55c1 100644
--- a/administrator/components/com_modules/views/modules/view.html.php
+++ b/administrator/components/com_modules/views/modules/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of modules.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesViewModules extends JViewLegacy
 {
@@ -26,6 +24,10 @@ class ModulesViewModules extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -37,11 +39,13 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
 		// Check if there are no matching items
-		if (!count($this->items)){
+		if (!count($this->items))
+		{
 			JFactory::getApplication()->enqueueMessage(
 				JText::_('COM_MODULES_MSG_MANAGE_NO_MODULES'),
 				'warning'
@@ -49,6 +53,7 @@ public function display($tpl = null)
 		}
 
 		$this->addToolbar();
+
 		// Include the component HTML helpers.
 		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 		parent::display($tpl);
@@ -57,6 +62,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -98,13 +105,15 @@ protected function addToolbar()
 		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
 		{
 			JToolbarHelper::deleteList('', 'modules.delete', 'JTOOLBAR_EMPTY_TRASH');
-		} elseif ($canDo->get('core.edit.state'))
+		}
+		elseif ($canDo->get('core.edit.state'))
 		{
 			JToolbarHelper::trash('modules.trash');
 		}
 
 		// Add a batch button
-		if ($user->authorise('core.create', 'com_modules') && $user->authorise('core.edit', 'com_modules') && $user->authorise('core.edit.state', 'com_modules'))
+		if ($user->authorise('core.create', 'com_modules') && $user->authorise('core.edit', 'com_modules')
+			&& $user->authorise('core.edit.state', 'com_modules'))
 		{
 			JHtml::_('bootstrap.modal', 'collapseModal');
 			$title = JText::_('JTOOLBAR_BATCH');
@@ -120,6 +129,7 @@ protected function addToolbar()
 		{
 			JToolbarHelper::preferences('com_modules');
 		}
+
 		JToolbarHelper::help('JHELP_EXTENSIONS_MODULE_MANAGER');
 
 		JHtmlSidebar::addEntry(
@@ -153,7 +163,10 @@ protected function addToolbar()
 		JHtmlSidebar::addFilter(
 			JText::_('COM_MODULES_OPTION_SELECT_POSITION'),
 			'filter_position',
-			JHtml::_('select.options', ModulesHelper::getPositions($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.position'))
+			JHtml::_(
+				'select.options',
+				ModulesHelper::getPositions($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.position')
+			)
 		);
 
 		JHtmlSidebar::addFilter(
diff --git a/administrator/components/com_modules/views/positions/view.html.php b/administrator/components/com_modules/views/positions/view.html.php
index 1d4ee3a9adcb8..7860c50ac5681 100644
--- a/administrator/components/com_modules/views/positions/view.html.php
+++ b/administrator/components/com_modules/views/positions/view.html.php
@@ -10,8 +10,8 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_modules
+ * View Module positions class.
+ * 
  * @since       1.6
  */
 class ModulesViewPositions extends JViewLegacy
@@ -24,6 +24,10 @@ class ModulesViewPositions extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -35,6 +39,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
diff --git a/administrator/components/com_modules/views/preview/view.html.php b/administrator/components/com_modules/views/preview/view.html.php
index 7b2e7800e2956..9f77cb0f21e64 100644
--- a/administrator/components/com_modules/views/preview/view.html.php
+++ b/administrator/components/com_modules/views/preview/view.html.php
@@ -12,12 +12,17 @@
 /**
  * HTML View class for the Modules component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesViewPreview extends JViewLegacy
 {
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
 	public function display($tpl = null)
 	{
 		$editor = JFactory::getConfig()->get('editor');
diff --git a/administrator/components/com_modules/views/select/view.html.php b/administrator/components/com_modules/views/select/view.html.php
index 6caf98af2f847..fe9af3d331dfb 100644
--- a/administrator/components/com_modules/views/select/view.html.php
+++ b/administrator/components/com_modules/views/select/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Modules component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_modules
- * @since       1.6
+ * @since  1.6
  */
 class ModulesViewSelect extends JViewLegacy
 {
@@ -24,6 +22,10 @@ class ModulesViewSelect extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -34,6 +36,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -47,7 +50,9 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
-	 * @since   3.0
+	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	protected function addToolbar()
 	{
diff --git a/administrator/components/com_newsfeeds/controller.php b/administrator/components/com_newsfeeds/controller.php
index 88a73e0ab0903..274120e37a556 100644
--- a/administrator/components/com_newsfeeds/controller.php
+++ b/administrator/components/com_newsfeeds/controller.php
@@ -12,9 +12,7 @@
 /**
  * Newsfeeds master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsController extends JControllerLegacy
 {
diff --git a/administrator/components/com_newsfeeds/controllers/newsfeed.php b/administrator/components/com_newsfeeds/controllers/newsfeed.php
index e48fb1a3319a2..38fa483390330 100644
--- a/administrator/components/com_newsfeeds/controllers/newsfeed.php
+++ b/administrator/components/com_newsfeeds/controllers/newsfeed.php
@@ -12,9 +12,7 @@
 /**
  * Newsfeed controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsControllerNewsfeed extends JControllerForm
 {
diff --git a/administrator/components/com_newsfeeds/controllers/newsfeeds.php b/administrator/components/com_newsfeeds/controllers/newsfeeds.php
index 74ed4b41311a3..de74cdbd588b5 100644
--- a/administrator/components/com_newsfeeds/controllers/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/controllers/newsfeeds.php
@@ -12,9 +12,7 @@
 /**
  * Newsfeeds list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsControllerNewsfeeds extends JControllerAdmin
 {
diff --git a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
index 67c8827da62f2..e762e58f170b5 100644
--- a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
+++ b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
@@ -12,12 +12,9 @@
 JLoader::register('NewsfeedsHelper', JPATH_ADMINISTRATOR . '/components/com_newsfeeds/helpers/newsfeeds.php');
 
 /**
- * Utility class for creating HTML Grids
- *
- * @static
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.5
+ * Utility class for creating HTML Grids.
+ * 
+ * @since  1.5
  */
 class JHtmlNewsfeed
 {
diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
index 630dc08801355..ffc5587c281fc 100644
--- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
@@ -12,9 +12,7 @@
 /**
  * Newsfeeds component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsHelper extends JHelperContent
 {
diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
index 5db009b0b8f81..6a54cfcab59b9 100644
--- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
+++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
@@ -12,9 +12,7 @@
 /**
  * Supports a modal newsfeeds picker.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldModal_Newsfeed extends JFormField
 {
diff --git a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
index ec42832d3ff06..6b365af70404b 100644
--- a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldNewsfeeds extends JFormFieldList
 {
diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php
index 306c9970d4a04..0fc55ceb604d8 100644
--- a/administrator/components/com_newsfeeds/models/newsfeed.php
+++ b/administrator/components/com_newsfeeds/models/newsfeed.php
@@ -14,9 +14,7 @@
 /**
  * Newsfeed model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsModelNewsfeed extends JModelAdmin
 {
diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php
index cc0e3127f5215..af81266420605 100644
--- a/administrator/components/com_newsfeeds/models/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/models/newsfeeds.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of newsfeed records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsModelNewsfeeds extends JModelList
 {
diff --git a/administrator/components/com_newsfeeds/tables/newsfeed.php b/administrator/components/com_newsfeeds/tables/newsfeed.php
index e6c5515581732..7c8cbe68c8691 100644
--- a/administrator/components/com_newsfeeds/tables/newsfeed.php
+++ b/administrator/components/com_newsfeeds/tables/newsfeed.php
@@ -10,8 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
+ * Newsfeed Table class.
  */
 class NewsfeedsTableNewsfeed extends JTable
 {
@@ -21,7 +20,7 @@ class NewsfeedsTableNewsfeed extends JTable
 	 * @var    array
 	 * @since  3.3
 	 */
-	protected $jsonEncode = array('params', 'metadata', 'images');
+	protected $_jsonEncode = array('params', 'metadata', 'images');
 
 	/**
 	 * Constructor
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
index e256c5715cf85..861c9dd4cac91 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a newsfeed.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsViewNewsfeed extends JViewLegacy
 {
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
index 5e5e03a3210c8..821414b1d5755 100644
--- a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
+++ b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of newsfeeds.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_newsfeeds
- * @since       1.6
+ * @since  1.6
  */
 class NewsfeedsViewNewsfeeds extends JViewLegacy
 {
diff --git a/administrator/components/com_plugins/controller.php b/administrator/components/com_plugins/controller.php
index 3ac7acbcc94d1..ffb4e7d5fda9d 100644
--- a/administrator/components/com_plugins/controller.php
+++ b/administrator/components/com_plugins/controller.php
@@ -12,9 +12,7 @@
 /**
  * Plugins master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.5
+ * @since  1.5
  */
 class PluginsController extends JControllerLegacy
 {
diff --git a/administrator/components/com_plugins/controllers/plugin.php b/administrator/components/com_plugins/controllers/plugin.php
index 31370540b8898..f35dedd20d648 100644
--- a/administrator/components/com_plugins/controllers/plugin.php
+++ b/administrator/components/com_plugins/controllers/plugin.php
@@ -12,9 +12,7 @@
 /**
  * Plugin controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.6
+ * @since  1.6
  */
 class PluginsControllerPlugin extends JControllerForm
 {
diff --git a/administrator/components/com_plugins/controllers/plugins.php b/administrator/components/com_plugins/controllers/plugins.php
index f5e148ed4d79c..61b30db346a8a 100644
--- a/administrator/components/com_plugins/controllers/plugins.php
+++ b/administrator/components/com_plugins/controllers/plugins.php
@@ -12,9 +12,7 @@
 /**
  * Plugins list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.6
+ * @since  1.6
  */
 class PluginsControllerPlugins extends JControllerAdmin
 {
diff --git a/administrator/components/com_plugins/helpers/plugins.php b/administrator/components/com_plugins/helpers/plugins.php
index 12b7532ab67a7..0f9323fa488c8 100644
--- a/administrator/components/com_plugins/helpers/plugins.php
+++ b/administrator/components/com_plugins/helpers/plugins.php
@@ -12,9 +12,7 @@
 /**
  * Plugins component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.6
+ * @since  1.6
  */
 class PluginsHelper
 {
diff --git a/administrator/components/com_plugins/models/fields/pluginordering.php b/administrator/components/com_plugins/models/fields/pluginordering.php
index ab02d2572fca2..119415c6c0c9f 100644
--- a/administrator/components/com_plugins/models/fields/pluginordering.php
+++ b/administrator/components/com_plugins/models/fields/pluginordering.php
@@ -14,9 +14,7 @@
 /**
  * Supports an HTML select list of plugins
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldPluginordering extends JFormFieldOrdering
 {
diff --git a/administrator/components/com_plugins/models/plugin.php b/administrator/components/com_plugins/models/plugin.php
index 3a4f8513649c4..0248743c3493e 100644
--- a/administrator/components/com_plugins/models/plugin.php
+++ b/administrator/components/com_plugins/models/plugin.php
@@ -12,9 +12,7 @@
 /**
  * Plugin model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.6
+ * @since  1.6
  */
 class PluginsModelPlugin extends JModelAdmin
 {
diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php
index 98ddf9617d43d..c0f831dfeff3e 100644
--- a/administrator/components/com_plugins/models/plugins.php
+++ b/administrator/components/com_plugins/models/plugins.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of plugin records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.6
+ * @since  1.6
  */
 class PluginsModelPlugins extends JModelList
 {
diff --git a/administrator/components/com_plugins/views/plugin/view.html.php b/administrator/components/com_plugins/views/plugin/view.html.php
index f5aa4765d5da4..e4dac87dc9dc5 100644
--- a/administrator/components/com_plugins/views/plugin/view.html.php
+++ b/administrator/components/com_plugins/views/plugin/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a plugin.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.5
+ * @since  1.5
  */
 class PluginsViewPlugin extends JViewLegacy
 {
diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php
index eef9d0f6d8dd9..cadba65af4ac4 100644
--- a/administrator/components/com_plugins/views/plugins/tmpl/default.php
+++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php
@@ -47,7 +47,7 @@
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugins'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if (!empty( $this->sidebar)) : ?>
-	<div id="sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
 	</div>
 	<div id="main-container" class="span10">
diff --git a/administrator/components/com_plugins/views/plugins/view.html.php b/administrator/components/com_plugins/views/plugins/view.html.php
index 6c3aedaefd6e8..7d38f2d506294 100644
--- a/administrator/components/com_plugins/views/plugins/view.html.php
+++ b/administrator/components/com_plugins/views/plugins/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of plugins.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_plugins
- * @since       1.5
+ * @since  1.5
  */
 class PluginsViewPlugins extends JViewLegacy
 {
diff --git a/administrator/components/com_postinstall/controllers/message.php b/administrator/components/com_postinstall/controllers/message.php
index c09e2949eefe0..9a2e7f80b5f7b 100644
--- a/administrator/components/com_postinstall/controllers/message.php
+++ b/administrator/components/com_postinstall/controllers/message.php
@@ -9,10 +9,15 @@
 
 defined('_JEXEC') or die;
 
+/**
+ * Postinstall message controller.
+ *
+ * @since  3.2
+ */
 class PostinstallControllerMessage extends FOFController
 {
 	/**
-	 * Resets all post-installation messages of the specified extension
+	 * Resets all post-installation messages of the specified extension.
 	 *
 	 * @return  void
 	 *
@@ -30,7 +35,7 @@ public function reset()
 	}
 
 	/**
-	 * Executes the action associated with an item
+	 * Executes the action associated with an item.
 	 *
 	 * @return  void
 	 *
@@ -38,7 +43,7 @@ public function reset()
 	 */
 	public function action()
 	{
-		// CSRF prevention
+		// CSRF prevention.
 		if ($this->csrfProtection)
 		{
 			$this->_csrfProtection();
diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index 8eec4eaa73b17..19fe6b3bc6519 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -12,9 +12,7 @@
 /**
  * Model class to manage postinstall messages
  *
- * @package     Joomla.Administrator
- * @subpackage  com_postinstall
- * @since       3.2
+ * @since  3.2
  */
 class PostinstallModelMessages extends FOFModel
 {
@@ -117,7 +115,7 @@ public function resetMessages($eid)
 	 * Do note that this a core method of the RAD Layer which operates directly
 	 * on the list it's being fed. A little touch of modern magic.
 	 *
-	 * @param   array  $resultArray  A list of items to process
+	 * @param   array  &$resultArray  A list of items to process
 	 *
 	 * @return  void
 	 *
@@ -130,7 +128,7 @@ protected function onProcessList(&$resultArray)
 
 		foreach ($resultArray as $key => $item)
 		{
-			// Filter out messages based on dynamically loaded programmatic conditions
+			// Filter out messages based on dynamically loaded programmatic conditions.
 			if (!empty($item->condition_file) && !empty($item->condition_method))
 			{
 				jimport('joomla.filesystem.file');
@@ -150,7 +148,7 @@ protected function onProcessList(&$resultArray)
 				}
 			}
 
-			// Load the necessary language files
+			// Load the necessary language files.
 			if (!empty($item->language_extension))
 			{
 				$hash = $item->language_client_id . '-' . $item->language_extension;
diff --git a/administrator/components/com_postinstall/postinstall.php b/administrator/components/com_postinstall/postinstall.php
index e8450c4535942..2d938f8c5d7ec 100644
--- a/administrator/components/com_postinstall/postinstall.php
+++ b/administrator/components/com_postinstall/postinstall.php
@@ -9,11 +9,11 @@
 
 defined('_JEXEC') or die;
 
-// Load the RAD layer
+// Load the RAD layer.
 if (!defined('FOF_INCLUDED'))
 {
 	require_once JPATH_LIBRARIES . '/fof/include.php';
 }
 
-// Dispatch the component
-FOFDispatcher::getTmpInstance('com_postinstall')->dispatch();
\ No newline at end of file
+// Dispatch the component.
+FOFDispatcher::getTmpInstance('com_postinstall')->dispatch();
diff --git a/administrator/components/com_postinstall/toolbar.php b/administrator/components/com_postinstall/toolbar.php
index 52018617d25e1..15f956ec2f62e 100644
--- a/administrator/components/com_postinstall/toolbar.php
+++ b/administrator/components/com_postinstall/toolbar.php
@@ -12,9 +12,7 @@
 /**
  * The Toolbar class renders the component title area and the toolbar.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_postinstall
- * @since       3.2
+ * @since  3.2
  */
 class PostinstallToolbar extends FOFToolbar
 {
diff --git a/administrator/components/com_postinstall/views/messages/view.html.php b/administrator/components/com_postinstall/views/messages/view.html.php
index bebcf08eaa36e..9f5e7dc2010ec 100644
--- a/administrator/components/com_postinstall/views/messages/view.html.php
+++ b/administrator/components/com_postinstall/views/messages/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Model class to display postinstall messages
  *
- * @package     Joomla.Administrator
- * @subpackage  com_postinstall
- * @since       3.2
+ * @since  3.2
  */
 class PostinstallViewMessages extends FOFViewHtml
 {
diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php
index b4739532896dc..9d6474c0397dc 100644
--- a/administrator/components/com_redirect/controller.php
+++ b/administrator/components/com_redirect/controller.php
@@ -12,9 +12,7 @@
 /**
  * Redirect master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectController extends JControllerLegacy
 {
@@ -27,15 +25,16 @@ class RedirectController extends JControllerLegacy
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   mixed    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController		This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		require_once JPATH_COMPONENT.'/helpers/redirect.php';
+		require_once JPATH_COMPONENT . '/helpers/redirect.php';
 
 		// Load the submenu.
 		RedirectHelper::addSubmenu($this->input->get('view', 'links'));
diff --git a/administrator/components/com_redirect/controllers/link.php b/administrator/components/com_redirect/controllers/link.php
index c89ebfc50a133..7855ab348ca93 100644
--- a/administrator/components/com_redirect/controllers/link.php
+++ b/administrator/components/com_redirect/controllers/link.php
@@ -12,9 +12,7 @@
 /**
  * Redirect link controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectControllerLink extends JControllerForm
 {
diff --git a/administrator/components/com_redirect/controllers/links.php b/administrator/components/com_redirect/controllers/links.php
index a2c707610e788..d22aa7f53e73d 100644
--- a/administrator/components/com_redirect/controllers/links.php
+++ b/administrator/components/com_redirect/controllers/links.php
@@ -12,14 +12,15 @@
 /**
  * Redirect link list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectControllerLinks extends JControllerAdmin
 {
 	/**
 	 * Method to update a record.
+	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	public function activate()
@@ -47,7 +48,8 @@ public function activate()
 			{
 				JError::raiseWarning(500, $model->getError());
 			}
-			else {
+			else
+			{
 				$this->setMessage(JText::plural('COM_REDIRECT_N_LINKS_UPDATED', count($ids)));
 			}
 		}
@@ -57,6 +59,13 @@ public function activate()
 
 	/**
 	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  The prefix of the model.
+	 * @param   array   $config  An array of settings.
+	 *
+	 * @return  JModel instance
+	 *
 	 * @since   1.6
 	 */
 	public function getModel($name = 'Link', $prefix = 'RedirectModel', $config = array('ignore_request' => true))
diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php
index 9201418b726ac..254d167dc08fc 100644
--- a/administrator/components/com_redirect/helpers/html/redirect.php
+++ b/administrator/components/com_redirect/helpers/html/redirect.php
@@ -10,23 +10,33 @@
 defined('_JEXEC') or die;
 
 /**
- * Utility class for creating HTML Grids
+ * Utility class for creating HTML Grids.
  *
- * @static
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class JHtmlRedirect
 {
 	/**
-	 * @param   int $value	The state value.
-	 * @param   int $i
-	 * @param   string  An optional prefix for the task.
-	 * @param   boolean		An optional setting for access control on the action.
+	 * Display the published or unpublished state of an item.
+	 *
+	 * @param   int      $value      The state value.
+	 * @param   int      $i          The ID of the item.
+	 * @param   boolean  $canChange  An optional prefix for the task.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 *
+	 * @throws  InvalidArgumentException
 	 */
-	public static function published($value = 0, $i, $canChange = true)
+	public static function published($value = 0, $i = null, $canChange = true)
 	{
+		// Note: $i is required but has to be an optional argument in the function call due to argument order
+		if (null === $i)
+		{
+			throw new InvalidArgumentException('$i is a required argument in JHtmlRedirect::published');
+		}
+
 		// Array of image, task, title, action
 		$states	= array(
 			1	=> array('tick.png',		'links.unpublish',	'JENABLED',	'COM_REDIRECT_DISABLE_LINK'),
@@ -35,11 +45,11 @@ public static function published($value = 0, $i, $canChange = true)
 			-2	=> array('trash.png',		'links.publish',		'JTRASHED',	'COM_REDIRECT_ENABLE_LINK'),
 		);
 		$state	= JArrayHelper::getValue($states, (int) $value, $states[0]);
-		$html	= JHtml::_('image', 'admin/'.$state[0], JText::_($state[2]), null, true);
+		$html	= JHtml::_('image', 'admin/' . $state[0], JText::_($state[2]), null, true);
+
 		if ($canChange)
 		{
-			$html	= '<a href="#" onclick="return listItemTask(\'cb'.$i.'\',\''.$state[1].'\')" title="'.JText::_($state[3]).'">'
-					. $html.'</a>';
+			$html = '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" title="' . JText::_($state[3]) . '">' . $html . '</a>';
 		}
 
 		return $html;
diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php
index 156917a8ea3cc..7814e5f93fcb8 100644
--- a/administrator/components/com_redirect/helpers/redirect.php
+++ b/administrator/components/com_redirect/helpers/redirect.php
@@ -12,9 +12,7 @@
 /**
  * Redirect component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectHelper
 {
@@ -23,7 +21,11 @@ class RedirectHelper
 	/**
 	 * Configure the Linkbar.
 	 *
-	 * @param   string	The name of the active view.
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void.
+	 *
+	 * @since   1.6
 	 */
 	public static function addSubmenu($vName)
 	{
diff --git a/administrator/components/com_redirect/models/link.php b/administrator/components/com_redirect/models/link.php
index 2184c1c77de5b..92ad5353fd7a3 100644
--- a/administrator/components/com_redirect/models/link.php
+++ b/administrator/components/com_redirect/models/link.php
@@ -12,9 +12,7 @@
 /**
  * Redirect link model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectModelLink extends JModelAdmin
 {
@@ -27,28 +25,31 @@ class RedirectModelLink extends JModelAdmin
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
-	 * @param   object    $record    A record object.
+	 * @param   object  $record  A record object.
 	 *
 	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
 	 * @since   1.6
 	 */
 	protected function canDelete($record)
 	{
-
 		if ($record->published != -2)
 		{
 			return false;
 		}
+
 		$user = JFactory::getUser();
+
 		return $user->authorise('core.delete', 'com_redirect');
 	}
 
 	/**
 	 * Method to test whether a record can have its state edited.
 	 *
-	 * @param   object    $record    A record object.
+	 * @param   object  $record  A record object.
 	 *
 	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
 	 * @since   1.6
 	 */
 	protected function canEditState($record)
@@ -62,10 +63,12 @@ protected function canEditState($record)
 	/**
 	 * Returns a reference to the a Table object, always creating it.
 	 *
-	 * @param   type      The table type to instantiate
-	 * @param   string    A prefix for the table class name. Optional.
-	 * @param   array     Configuration array for model. Optional.
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
 	 * @return  JTable    A database object
+	 *
 	 * @since   1.6
 	 */
 	public function getTable($type = 'Link', $prefix = 'RedirectTable', $config = array())
@@ -76,15 +79,18 @@ public function getTable($type = 'Link', $prefix = 'RedirectTable', $config = ar
 	/**
 	 * Method to get the record form.
 	 *
-	 * @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  JForm    A JForm object on success, false on failure
+	 * @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  JForm  A JForm object on success, false on failure
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Get the form.
 		$form = $this->loadForm('com_redirect.link', 'link', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -108,6 +114,7 @@ public function getForm($data = array(), $loadData = true)
 	 * Method to get the data that should be injected in the form.
 	 *
 	 * @return  mixed  The data for the form.
+	 *
 	 * @since   1.6
 	 */
 	protected function loadFormData()
@@ -128,10 +135,12 @@ protected function loadFormData()
 	/**
 	 * Method to activate links.
 	 *
-	 * @param   array     An array of link ids.
-	 * @param   string    The new URL to set for the redirect.
-	 * @param   string    A comment for the redirect links.
+	 * @param   array   &$pks     An array of link ids.
+	 * @param   string  $url      The new URL to set for the redirect.
+	 * @param   string  $comment  A comment for the redirect links.
+	 *
 	 * @return  boolean  Returns true on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function activate(&$pks, $url, $comment = null)
@@ -151,6 +160,7 @@ public function activate(&$pks, $url, $comment = null)
 		{
 			$pks = array();
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+
 			return false;
 		}
 
@@ -160,7 +170,7 @@ public function activate(&$pks, $url, $comment = null)
 			$query = $db->getQuery(true)
 				->update($db->quoteName('#__redirect_links'))
 				->set($db->quoteName('new_url') . ' = ' . $db->quote($url))
-				->set($db->quoteName('published') . ' = ' . $db->quote(1))
+				->set($db->quoteName('published') . ' = ' . (int) 1)
 				->set($db->quoteName('comment') . ' = ' . $db->quote($comment))
 				->where($db->quoteName('id') . ' IN (' . implode(',', $pks) . ')');
 			$db->setQuery($query);
@@ -172,9 +182,11 @@ public function activate(&$pks, $url, $comment = null)
 			catch (RuntimeException $e)
 			{
 				$this->setError($e->getMessage());
+
 				return false;
 			}
 		}
+
 		return true;
 	}
 }
diff --git a/administrator/components/com_redirect/models/links.php b/administrator/components/com_redirect/models/links.php
index e11f663366940..394daee7f5770 100644
--- a/administrator/components/com_redirect/models/links.php
+++ b/administrator/components/com_redirect/models/links.php
@@ -12,17 +12,15 @@
 /**
  * Methods supporting a list of redirect links.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectModelLinks extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
-	 * @see     JController
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @since   1.6
 	 */
 	public function __construct($config = array())
@@ -79,9 +77,10 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
 	 *
-	 * @return  string    A store id.
 	 * @since   1.6
 	 */
 	protected function getStoreId($id = '')
@@ -97,6 +96,7 @@ protected function getStoreId($id = '')
 	 * Build an SQL query to load the list data.
 	 *
 	 * @return  JDatabaseQuery
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -116,6 +116,7 @@ protected function getListQuery()
 
 		// Filter by published state
 		$state = $this->getState('filter.state');
+
 		if (is_numeric($state))
 		{
 			$query->where('a.published = ' . (int) $state);
@@ -127,6 +128,7 @@ protected function getListQuery()
 
 		// Filter the items over the search string if set.
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -148,7 +150,6 @@ protected function getListQuery()
 		// Add the list ordering clause.
 		$query->order($db->escape($this->getState('list.ordering', 'a.old_url')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 }
diff --git a/administrator/components/com_redirect/tables/link.php b/administrator/components/com_redirect/tables/link.php
index 49bb2a20d4362..33810643468ed 100644
--- a/administrator/components/com_redirect/tables/link.php
+++ b/administrator/components/com_redirect/tables/link.php
@@ -12,21 +12,18 @@
 /**
  * Link Table for Redirect.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectTableLink extends JTable
 {
 	/**
 	 * Constructor
 	 *
-	 * @param   object	Database object
+	 * @param   JDatabaseDriver  $db  Database object.
 	 *
-	 * @return  void
 	 * @since   1.6
 	 */
-	public function __construct(&$db)
+	public function __construct($db)
 	{
 		parent::__construct('#__redirect_links', 'id', $db);
 	}
@@ -35,6 +32,7 @@ public function __construct(&$db)
 	 * Overloaded check function
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	public function check()
@@ -46,6 +44,7 @@ public function check()
 		if (empty($this->old_url))
 		{
 			$this->setError(JText::_('COM_REDIRECT_ERROR_SOURCE_URL_REQUIRED'));
+
 			return false;
 		}
 
@@ -53,6 +52,7 @@ public function check()
 		if (empty($this->new_url))
 		{
 			$this->setError(JText::_('COM_REDIRECT_ERROR_DESTINATION_URL_REQUIRED'));
+
 			return false;
 		}
 
@@ -60,6 +60,7 @@ public function check()
 		if ($this->old_url == $this->new_url)
 		{
 			$this->setError(JText::_('COM_REDIRECT_ERROR_DUPLICATE_URLS'));
+
 			return false;
 		}
 
@@ -77,6 +78,7 @@ public function check()
 		if ($xid && $xid != (int) $this->id)
 		{
 			$this->setError(JText::_('COM_REDIRECT_ERROR_DUPLICATE_OLD_URL'));
+
 			return false;
 		}
 
@@ -86,10 +88,10 @@ public function check()
 	/**
 	 * Overriden store method to set dates.
 	 *
-	 * @param   boolean	True to update fields even if they are null.
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
 	 *
 	 * @return  boolean  True on success.
-	 * @see     JTable::store
+	 *
 	 * @since   1.6
 	 */
 	public function store($updateNulls = false)
diff --git a/administrator/components/com_redirect/views/link/view.html.php b/administrator/components/com_redirect/views/link/view.html.php
index af73e4a9a111b..b34b15adf8df0 100644
--- a/administrator/components/com_redirect/views/link/view.html.php
+++ b/administrator/components/com_redirect/views/link/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a redirect link.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectViewLink extends JViewLegacy
 {
@@ -25,7 +23,11 @@ class RedirectViewLink extends JViewLegacy
 	protected $state;
 
 	/**
-	 * Display the view
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  False if unsuccessful, otherwise void.
 	 *
 	 * @since   1.6
 	 */
@@ -39,6 +41,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -49,6 +52,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -66,10 +71,11 @@ protected function addToolbar()
 			JToolbarHelper::save('link.save');
 		}
 
-		// This component does not support Save as Copy due to uniqueness checks.
-		// While it can be done, it causes too much confusion if the user does
-		// not change the Old URL.
-
+		/**
+		 * This component does not support Save as Copy due to uniqueness checks.
+		 * While it can be done, it causes too much confusion if the user does
+		 * not change the Old URL.
+		 */
 		if ($canDo->get('core.edit') && $canDo->get('core.create'))
 		{
 			JToolbarHelper::save2new('link.save2new');
diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php
index df2de3454d08a..c346c08c26a6c 100644
--- a/administrator/components/com_redirect/views/links/view.html.php
+++ b/administrator/components/com_redirect/views/links/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of redirection links.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_redirect
- * @since       1.6
+ * @since  1.6
  */
 class RedirectViewLinks extends JViewLegacy
 {
@@ -27,7 +25,11 @@ class RedirectViewLinks extends JViewLegacy
 	protected $state;
 
 	/**
-	 * Display the view
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  False if unsuccessful, otherwise void.
 	 *
 	 * @since   1.6
 	 */
@@ -42,6 +44,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -53,6 +56,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -61,24 +66,30 @@ protected function addToolbar()
 		$canDo	= JHelperContent::getActions('com_redirect');
 
 		JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINKS'), 'refresh redirect');
+
 		if ($canDo->get('core.create'))
 		{
 			JToolbarHelper::addNew('link.add');
 		}
+
 		if ($canDo->get('core.edit'))
 		{
 			JToolbarHelper::editList('link.edit');
 		}
+
 		if ($canDo->get('core.edit.state'))
 		{
-			if ($state->get('filter.state') != 2){
+			if ($state->get('filter.state') != 2)
+			{
 				JToolbarHelper::divider();
 				JToolbarHelper::publish('links.publish', 'JTOOLBAR_ENABLE', true);
 				JToolbarHelper::unpublish('links.unpublish', 'JTOOLBAR_DISABLE', true);
 			}
+
 			if ($state->get('filter.state') != -1 )
 			{
 				JToolbarHelper::divider();
+
 				if ($state->get('filter.state') != 2)
 				{
 					JToolbarHelper::archiveList('links.archive');
@@ -89,20 +100,24 @@ protected function addToolbar()
 				}
 			}
 		}
+
 		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
 		{
 			JToolbarHelper::deleteList('', 'links.delete', 'JTOOLBAR_EMPTY_TRASH');
 			JToolbarHelper::divider();
-		} elseif ($canDo->get('core.edit.state'))
+		}
+		elseif ($canDo->get('core.edit.state'))
 		{
 			JToolbarHelper::trash('links.trash');
 			JToolbarHelper::divider();
 		}
+
 		if ($canDo->get('core.admin'))
 		{
 			JToolbarHelper::preferences('com_redirect');
 			JToolbarHelper::divider();
 		}
+
 		JToolbarHelper::help('JHELP_COMPONENTS_REDIRECT_MANAGER');
 
 		JHtmlSidebar::setAction('index.php?option=com_redirect&view=links');
diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php
index d1b9d8fd00c30..c2ca2d2a96bd7 100644
--- a/administrator/components/com_search/controller.php
+++ b/administrator/components/com_search/controller.php
@@ -12,9 +12,7 @@
 /**
  * Search master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_search
- * @since       1.6
+ * @since  1.6
  */
 class SearchController extends JControllerLegacy
 {
@@ -27,15 +25,16 @@ class SearchController extends JControllerLegacy
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController		This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		require_once JPATH_COMPONENT.'/helpers/search.php';
+		require_once JPATH_COMPONENT . '/helpers/search.php';
 
 		// Load the submenu.
 		SearchHelper::addSubmenu($this->input->get('view', 'searches'));
diff --git a/administrator/components/com_search/controllers/searches.php b/administrator/components/com_search/controllers/searches.php
index 82cfe356c06e0..ab9d755dab097 100644
--- a/administrator/components/com_search/controllers/searches.php
+++ b/administrator/components/com_search/controllers/searches.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of search terms.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_search
- * @since       1.6
+ * @since  1.6
  */
 class SearchControllerSearches extends JControllerLegacy
 {
diff --git a/administrator/components/com_search/helpers/search.php b/administrator/components/com_search/helpers/search.php
index 7bf046e972b26..353c08f1efcee 100644
--- a/administrator/components/com_search/helpers/search.php
+++ b/administrator/components/com_search/helpers/search.php
@@ -12,16 +12,17 @@
 /**
  * Search component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_search
- * @since       1.5
+ * @since  1.5
  */
 class SearchHelper
 {
 	/**
 	 * Configure the Linkbar.
 	 *
-	 * @param   string	The name of the active view.
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public static function addSubmenu($vName)
@@ -34,19 +35,27 @@ public static function addSubmenu($vName)
 	 *
 	 * @return  JObject
 	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead.
 	 */
 	public static function getActions()
 	{
-		// Log usage of deprecated function
+		// Log usage of deprecated function.
 		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
 
-		// Get list of actions
+		// Get list of actions.
 		$result = JHelperContent::getActions('com_search');
 
 		return $result;
 	}
 
+	/**
+	 * Sanitise search word.
+	 *
+	 * @param   string  &$searchword   Search word to be sanitised.
+	 * @param   string  $searchphrase  Either 'all', 'any' or 'exact'.
+	 *
+	 * @return  boolean  True if search word needs to be sanitised.
+	 */
 	public static function santiseSearchWord(&$searchword, $searchphrase)
 	{
 		$ignored = false;
@@ -55,7 +64,7 @@ public static function santiseSearchWord(&$searchword, $searchphrase)
 		$tag           = $lang->getTag();
 		$search_ignore = $lang->getIgnoredSearchWords();
 
-		// Deprecated in 1.6 use $lang->getIgnoredSearchWords instead
+		// Deprecated in 1.6 use $lang->getIgnoredSearchWords instead.
 		$ignoreFile = $lang->getLanguagePath() . '/' . $tag . '/' . $tag . '.ignore.php';
 
 		if (file_exists($ignoreFile))
@@ -63,16 +72,16 @@ public static function santiseSearchWord(&$searchword, $searchphrase)
 			include $ignoreFile;
 		}
 
-		// Check for words to ignore
+		// Check for words to ignore.
 		$aterms = explode(' ', JString::strtolower($searchword));
 
-		// First case is single ignored word
+		// First case is single ignored word.
 		if (count($aterms) == 1 && in_array(JString::strtolower($searchword), $search_ignore))
 		{
 			$ignored = true;
 		}
 
-		// Filter out search terms that are too small
+		// Filter out search terms that are too small.
 		$lower_limit = $lang->getLowerLimitSearchWord();
 
 		foreach ($aterms as $aterm)
@@ -83,7 +92,7 @@ public static function santiseSearchWord(&$searchword, $searchphrase)
 			}
 		}
 
-		// Next is to remove ignored words from type 'all' or 'any' (not exact) searches with multiple words
+		// Next is to remove ignored words from type 'all' or 'any' (not exact) searches with multiple words.
 		if (count($aterms) > 1 && $searchphrase != 'exact')
 		{
 			$pruned     = array_diff($aterms, $search_ignore);
@@ -94,6 +103,12 @@ public static function santiseSearchWord(&$searchword, $searchphrase)
 	}
 
 	/**
+	 * Does search word need to be limited?
+	 *
+	 * @param   string  &$searchword  Search word to be checked.
+	 *
+	 * @return  boolean  True if search word should be limited; false otherwise.
+	 *
 	 * @since  1.5
 	 */
 	public static function limitSearchWord(&$searchword)
@@ -102,7 +117,7 @@ public static function limitSearchWord(&$searchword)
 
 		$lang = JFactory::getLanguage();
 
-		// Limit searchword to a maximum of characters
+		// Limit searchword to a maximum of characters.
 		$upper_limit = $lang->getUpperLimitSearchWord();
 
 		if (JString::strlen($searchword) > $upper_limit)
@@ -111,7 +126,7 @@ public static function limitSearchWord(&$searchword)
 			$restriction = true;
 		}
 
-		// Searchword must contain a minimum of characters
+		// Searchword must contain a minimum of characters.
 		if ($searchword && JString::strlen($searchword) < $lang->getLowerLimitSearchWord())
 		{
 			$searchword  = '';
@@ -122,14 +137,14 @@ public static function limitSearchWord(&$searchword)
 	}
 
 	/**
-	 * Logs a search term
+	 * Logs a search term.
 	 *
-	 * @param   string  $search_term  The term being searched
+	 * @param   string  $search_term  The term being searched.
 	 *
 	 * @return  void
 	 *
 	 * @since   1.5
-	 * @deprecated  4.0  Use JSearchHelper::logSearch() instead
+	 * @deprecated  4.0  Use JSearchHelper::logSearch() instead.
 	 */
 	public static function logSearch($search_term)
 	{
@@ -139,10 +154,10 @@ public static function logSearch($search_term)
 	}
 
 	/**
-	 * Prepares results from search for display
+	 * Prepares results from search for display.
 	 *
-	 * @param   string  $text        The source string
-	 * @param   string  $searchword  The searchword to select around
+	 * @param   string  $text        The source string.
+	 * @param   string  $searchword  The searchword to select around.
 	 *
 	 * @return  string
 	 *
@@ -150,26 +165,26 @@ public static function logSearch($search_term)
 	 */
 	public static function prepareSearchContent($text, $searchword)
 	{
-		// Strips tags won't remove the actual jscript
+		// Strips tags won't remove the actual jscript.
 		$text = preg_replace("'<script[^>]*>.*?</script>'si", "", $text);
 		$text = preg_replace('/{.+?}/', '', $text);
 
 		// $text = preg_replace('/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is','\2', $text);
 
-		// Replace line breaking tags with whitespace
+		// Replace line breaking tags with whitespace.
 		$text = preg_replace("'<(br[^/>]*?/|hr[^/>]*?/|/(div|h[1-6]|li|p|td))>'si", ' ', $text);
 
 		return self::_smartSubstr(strip_tags($text), $searchword);
 	}
 
 	/**
-	 * Checks an object for search terms (after stripping fields of HTML)
+	 * Checks an object for search terms (after stripping fields of HTML).
 	 *
-	 * @param   object  $object      The object to check
-	 * @param   string  $searchTerm  Search words to check for
-	 * @param   array   $fields      List of object variables to check against
+	 * @param   object  $object      The object to check.
+	 * @param   string  $searchTerm  Search words to check for.
+	 * @param   array   $fields      List of object variables to check against.
 	 *
-	 * @return  boolean True if searchTerm is in object, false otherwise
+	 * @return  boolean True if searchTerm is in object, false otherwise.
 	 */
 	public static function checkNoHtml($object, $searchTerm, $fields)
 	{
@@ -215,9 +230,9 @@ public static function checkNoHtml($object, $searchTerm, $fields)
 	}
 
 	/**
-	 * Transliterates given text to ASCII
+	 * Transliterates given text to ASCII.
 	 *
-	 * @param   string  $str  String to remove accents from
+	 * @param   string  $str  String to remove accents from.
 	 *
 	 * @return  string
 	 *
@@ -227,15 +242,15 @@ public static function remove_accents($str)
 	{
 		$str = JLanguageTransliterate::utf8_latin_to_ascii($str);
 
-		//TODO: remove other prefixes as well?
+		// @TODO: remove other prefixes as well?
 		return preg_replace("/[\"'^]([a-z])/ui", '\1', $str);
 	}
 
 	/**
-	 * returns substring of characters around a searchword
+	 * Returns substring of characters around a searchword.
 	 *
-	 * @param   string   $text        The source string
-	 * @param   integer  $searchword  Number of chars to return
+	 * @param   string   $text        The source string.
+	 * @param   integer  $searchword  Number of chars to return.
 	 *
 	 * @return  string
 	 *
diff --git a/administrator/components/com_search/helpers/site.php b/administrator/components/com_search/helpers/site.php
index 71c51e43006f8..3dd280cd2ad75 100644
--- a/administrator/components/com_search/helpers/site.php
+++ b/administrator/components/com_search/helpers/site.php
@@ -12,25 +12,28 @@
 /**
  * Mock JSite class used to fool the frontend search plugins because they route the results.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_search
- * @since       1.5
+ * @since  1.5
  */
 class JSite extends JObject
 {
 	/**
-	 * False method to fool the frontend search plugins
+	 * False method to fool the frontend search plugins.
+	 *
+	 * @return  JSite
 	 *
 	 * @since  1.5
 	 */
 	public function getMenu()
 	{
 		$result = new JSite;
+
 		return $result;
 	}
 
 	/**
-	 * False method to fool the frontend search plugins
+	 * False method to fool the frontend search plugins.
+	 *
+	 * @return  array
 	 *
 	 * @since  1.5
 	 */
diff --git a/administrator/components/com_search/models/searches.php b/administrator/components/com_search/models/searches.php
index b0441cac8a521..69a10b0f6c109 100644
--- a/administrator/components/com_search/models/searches.php
+++ b/administrator/components/com_search/models/searches.php
@@ -12,16 +12,15 @@
 /**
  * Methods supporting a list of search terms.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_search
- * @since       1.6
+ * @since  1.6
  */
 class SearchModelSearches extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -74,9 +73,10 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
+	 *
 	 * @since   1.6
 	 */
 	protected function getStoreId($id = '')
@@ -92,6 +92,7 @@ protected function getStoreId($id = '')
 	 * Build an SQL query to load the list data.
 	 *
 	 * @return  JDatabaseQuery
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -117,6 +118,7 @@ protected function getListQuery()
 
 		// Filter by search in title
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
@@ -126,7 +128,6 @@ protected function getListQuery()
 		// Add the list ordering clause.
 		$query->order($db->escape($this->getState('list.ordering', 'a.hits')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 
@@ -134,6 +135,7 @@ protected function getListQuery()
 	 * Override the parnet getItems to inject optional data.
 	 *
 	 * @return  mixed  An array of objects on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function getItems()
@@ -157,6 +159,7 @@ public function getItems()
 			{
 				$results = $app->triggerEvent('onContentSearch', array($item->search_term));
 				$item->returns = 0;
+
 				foreach ($results as $result)
 				{
 					$item->returns += count($result);
@@ -171,6 +174,7 @@ public function getItems()
 	 * Method to reset the seach log table.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	public function reset()
@@ -187,6 +191,7 @@ public function reset()
 		catch (RuntimeException $e)
 		{
 			$this->setError($e->getMessage());
+
 			return false;
 		}
 
diff --git a/administrator/components/com_search/views/searches/view.html.php b/administrator/components/com_search/views/searches/view.html.php
index 55343b49c05ae..c66b0ab80192a 100644
--- a/administrator/components/com_search/views/searches/view.html.php
+++ b/administrator/components/com_search/views/searches/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of search terms.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_search
- * @since       1.5
+ * @since  1.5
  */
 class SearchViewSearches extends JViewLegacy
 {
@@ -27,7 +25,11 @@ class SearchViewSearches extends JViewLegacy
 	protected $state;
 
 	/**
-	 * Display the view
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -41,6 +43,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -51,6 +54,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -63,11 +68,14 @@ protected function addToolbar()
 		{
 			JToolbarHelper::custom('searches.reset', 'refresh.png', 'refresh_f2.png', 'JSEARCH_RESET', false);
 		}
+
 		JToolbarHelper::divider();
+
 		if ($canDo->get('core.admin'))
 		{
 			JToolbarHelper::preferences('com_search');
 		}
+
 		JToolbarHelper::divider();
 		JToolbarHelper::help('JHELP_COMPONENTS_SEARCH');
 	}
diff --git a/administrator/components/com_tags/controller.php b/administrator/components/com_tags/controller.php
index 9b6f4bca3bb7a..545528f7e176c 100644
--- a/administrator/components/com_tags/controller.php
+++ b/administrator/components/com_tags/controller.php
@@ -12,9 +12,7 @@
 /**
  * Tags view class for the Tags package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsController extends JControllerLegacy
 {
diff --git a/administrator/components/com_tags/controllers/tag.php b/administrator/components/com_tags/controllers/tag.php
index e5ba38534e3f7..b46e44586ddc4 100644
--- a/administrator/components/com_tags/controllers/tag.php
+++ b/administrator/components/com_tags/controllers/tag.php
@@ -12,9 +12,7 @@
 /**
  * The Tag Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsControllerTag extends JControllerForm
 {
diff --git a/administrator/components/com_tags/controllers/tags.php b/administrator/components/com_tags/controllers/tags.php
index 08a6b620eab4a..af330874e73b4 100644
--- a/administrator/components/com_tags/controllers/tags.php
+++ b/administrator/components/com_tags/controllers/tags.php
@@ -12,9 +12,7 @@
 /**
  * The Tags List Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsControllerTags extends JControllerAdmin
 {
diff --git a/administrator/components/com_tags/helpers/tags.php b/administrator/components/com_tags/helpers/tags.php
index d34ae4e7e5f2c..009df8bd83a04 100644
--- a/administrator/components/com_tags/helpers/tags.php
+++ b/administrator/components/com_tags/helpers/tags.php
@@ -12,9 +12,7 @@
 /**
  * Tags helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsHelper extends JHelperContent
 {
diff --git a/administrator/components/com_tags/models/tag.php b/administrator/components/com_tags/models/tag.php
index 7f402f923f8a9..88e9ed2309819 100644
--- a/administrator/components/com_tags/models/tag.php
+++ b/administrator/components/com_tags/models/tag.php
@@ -12,9 +12,7 @@
 /**
  * Tags Component Tag Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsModelTag extends JModelAdmin
 {
diff --git a/administrator/components/com_tags/models/tags.php b/administrator/components/com_tags/models/tags.php
index 898ba21664579..64ad947a1bd93 100644
--- a/administrator/components/com_tags/models/tags.php
+++ b/administrator/components/com_tags/models/tags.php
@@ -12,9 +12,7 @@
 /**
  * Tags Component Tags Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsModelTags extends JModelList
 {
diff --git a/administrator/components/com_tags/tables/tag.php b/administrator/components/com_tags/tables/tag.php
index de5d6d7587d36..171284ad7b3a9 100644
--- a/administrator/components/com_tags/tables/tag.php
+++ b/administrator/components/com_tags/tables/tag.php
@@ -12,9 +12,7 @@
 /**
  * Tags table
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsTableTag extends JTableNested
 {
diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php
index bf2f56805d7af..73abc9c3096d9 100644
--- a/administrator/components/com_tags/views/tag/view.html.php
+++ b/administrator/components/com_tags/views/tag/view.html.php
@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Tags component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsViewTag extends JViewLegacy
 {
diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php
index a1f959f24dc23..b964ce38c25fc 100644
--- a/administrator/components/com_tags/views/tags/view.html.php
+++ b/administrator/components/com_tags/views/tags/view.html.php
@@ -12,9 +12,7 @@
 /**
  * Tags view class for the Tags package.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_tags
- * @since       3.1
+ * @since  3.1
  */
 class TagsViewTags extends JViewLegacy
 {
diff --git a/administrator/components/com_templates/controller.php b/administrator/components/com_templates/controller.php
index bf77577b77ac3..f268b803210df 100644
--- a/administrator/components/com_templates/controller.php
+++ b/administrator/components/com_templates/controller.php
@@ -12,9 +12,7 @@
 /**
  * Templates manager master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesController extends JControllerLegacy
 {
diff --git a/administrator/components/com_templates/controllers/style.php b/administrator/components/com_templates/controllers/style.php
index 2188a9d5b5312..f61ad30a7f4ac 100644
--- a/administrator/components/com_templates/controllers/style.php
+++ b/administrator/components/com_templates/controllers/style.php
@@ -12,9 +12,7 @@
 /**
  * Template style controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesControllerStyle extends JControllerForm
 {
diff --git a/administrator/components/com_templates/controllers/styles.php b/administrator/components/com_templates/controllers/styles.php
index 57ac317cfa31c..16f735c48eb5e 100644
--- a/administrator/components/com_templates/controllers/styles.php
+++ b/administrator/components/com_templates/controllers/styles.php
@@ -12,9 +12,7 @@
 /**
  * Template styles list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesControllerStyles extends JControllerAdmin
 {
diff --git a/administrator/components/com_templates/controllers/template.php b/administrator/components/com_templates/controllers/template.php
index d276f59584f14..d40542be11599 100644
--- a/administrator/components/com_templates/controllers/template.php
+++ b/administrator/components/com_templates/controllers/template.php
@@ -14,9 +14,7 @@
 /**
  * Template style controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesControllerTemplate extends JControllerLegacy
 {
diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/helpers/html/templates.php
index ee6bd5007a940..07399e9831f3a 100644
--- a/administrator/components/com_templates/helpers/html/templates.php
+++ b/administrator/components/com_templates/helpers/html/templates.php
@@ -10,8 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_templates
+ * JHtml helper class.
  */
 class JHtmlTemplates
 {
diff --git a/administrator/components/com_templates/helpers/template.php b/administrator/components/com_templates/helpers/template.php
index f4c9330f39231..37411e19aabe1 100644
--- a/administrator/components/com_templates/helpers/template.php
+++ b/administrator/components/com_templates/helpers/template.php
@@ -12,9 +12,7 @@
 /**
  * Template Helper class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       3.2
+ * @since  3.2
  */
 abstract class TemplateHelper
 {
diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php
index 17e37231fe407..892f021a5d4d2 100644
--- a/administrator/components/com_templates/helpers/templates.php
+++ b/administrator/components/com_templates/helpers/templates.php
@@ -12,9 +12,7 @@
 /**
  * Templates component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesHelper
 {
diff --git a/administrator/components/com_templates/models/style.php b/administrator/components/com_templates/models/style.php
index 17c549923246c..fa352b17fcf4b 100644
--- a/administrator/components/com_templates/models/style.php
+++ b/administrator/components/com_templates/models/style.php
@@ -12,9 +12,7 @@
 /**
  * Template style model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesModelStyle extends JModelAdmin
 {
diff --git a/administrator/components/com_templates/models/styles.php b/administrator/components/com_templates/models/styles.php
index e5c3e7438c893..bb0fef0ef56ed 100644
--- a/administrator/components/com_templates/models/styles.php
+++ b/administrator/components/com_templates/models/styles.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of template style records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesModelStyles extends JModelList
 {
diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php
index 7506868645a7c..ad13ae1ea75dc 100644
--- a/administrator/components/com_templates/models/template.php
+++ b/administrator/components/com_templates/models/template.php
@@ -12,9 +12,7 @@
 /**
  * Template model class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesModelTemplate extends JModelForm
 {
diff --git a/administrator/components/com_templates/models/templates.php b/administrator/components/com_templates/models/templates.php
index 810e320381fae..7cf979370455a 100644
--- a/administrator/components/com_templates/models/templates.php
+++ b/administrator/components/com_templates/models/templates.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of template extension records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesModelTemplates extends JModelList
 {
diff --git a/administrator/components/com_templates/tables/style.php b/administrator/components/com_templates/tables/style.php
index c890ad6c894ac..a3d63f1798042 100644
--- a/administrator/components/com_templates/tables/style.php
+++ b/administrator/components/com_templates/tables/style.php
@@ -12,9 +12,7 @@
 /**
  * Template style table class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesTableStyle extends JTable
 {
diff --git a/administrator/components/com_templates/views/style/view.html.php b/administrator/components/com_templates/views/style/view.html.php
index 2e33b29549ef1..2c8307152cd1e 100644
--- a/administrator/components/com_templates/views/style/view.html.php
+++ b/administrator/components/com_templates/views/style/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a template style.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesViewStyle extends JViewLegacy
 {
diff --git a/administrator/components/com_templates/views/style/view.json.php b/administrator/components/com_templates/views/style/view.json.php
index 01f7fdc7a80d2..5e41fa94ef2ad 100644
--- a/administrator/components/com_templates/views/style/view.json.php
+++ b/administrator/components/com_templates/views/style/view.json.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a template style.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesViewStyle extends JViewLegacy
 {
diff --git a/administrator/components/com_templates/views/styles/view.html.php b/administrator/components/com_templates/views/styles/view.html.php
index 981f6b134b77d..3d6886b7ad005 100644
--- a/administrator/components/com_templates/views/styles/view.html.php
+++ b/administrator/components/com_templates/views/styles/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of template styles.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesViewStyles extends JViewLegacy
 {
diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php
index 1fe1bd316bc96..a90ee5b35ad9c 100644
--- a/administrator/components/com_templates/views/template/view.html.php
+++ b/administrator/components/com_templates/views/template/view.html.php
@@ -12,9 +12,7 @@
 /**
 * View to edit a template style.
 *
-* @package     Joomla.Administrator
-* @subpackage  com_templates
-* @since       1.6
+* @since  1.6
 */
 class TemplatesViewTemplate extends JViewLegacy
 {
diff --git a/administrator/components/com_templates/views/templates/view.html.php b/administrator/components/com_templates/views/templates/view.html.php
index 993ba9a35bd13..d78f1435a9cb8 100644
--- a/administrator/components/com_templates/views/templates/view.html.php
+++ b/administrator/components/com_templates/views/templates/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of template styles.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- * @since       1.6
+ * @since  1.6
  */
 class TemplatesViewTemplates extends JViewLegacy
 {
diff --git a/administrator/components/com_users/controller.php b/administrator/components/com_users/controller.php
index e3d92d3ad551c..4c2d8087a8be4 100644
--- a/administrator/components/com_users/controller.php
+++ b/administrator/components/com_users/controller.php
@@ -12,18 +12,17 @@
 /**
  * Users master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersController extends JControllerLegacy
 {
 	/**
 	 * Checks whether a user can see this view.
 	 *
-	 * @param   string   $view  The view name.
+	 * @param   string  $view  The view name.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	protected function canView($view)
@@ -49,10 +48,11 @@ protected function canView($view)
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean      If true, the view output will be cached
-	 * @param   array        An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController	 This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
diff --git a/administrator/components/com_users/controllers/group.php b/administrator/components/com_users/controllers/group.php
index d66db527e7104..a06437195d132 100644
--- a/administrator/components/com_users/controllers/group.php
+++ b/administrator/components/com_users/controllers/group.php
@@ -12,9 +12,7 @@
 /**
  * User view level controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerGroup extends JControllerForm
 {
@@ -29,10 +27,11 @@ class UsersControllerGroup extends JControllerForm
 	 *
 	 * Overrides JControllerForm::allowSave to check the core.admin permission.
 	 *
-	 * @param   array   An array of input data.
-	 * @param   string  The name of the key for the primary key.
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	protected function allowSave($data, $key = 'id')
@@ -45,10 +44,11 @@ protected function allowSave($data, $key = 'id')
 	 *
 	 * Checks that non-Super Admins are not editing Super Admins.
 	 *
-	 * @param   array   An array of input data.
-	 * @param   string  The name of the key for the primary key.
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
@@ -65,5 +65,4 @@ protected function allowEdit($data = array(), $key = 'id')
 
 		return parent::allowEdit($data, $key);
 	}
-
 }
diff --git a/administrator/components/com_users/controllers/groups.php b/administrator/components/com_users/controllers/groups.php
index bd14c62b62059..e8b301f738661 100644
--- a/administrator/components/com_users/controllers/groups.php
+++ b/administrator/components/com_users/controllers/groups.php
@@ -12,9 +12,7 @@
 /**
  * User groups list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerGroups extends JControllerAdmin
 {
@@ -27,6 +25,12 @@ class UsersControllerGroups extends JControllerAdmin
 	/**
 	 * Proxy for getModel.
 	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
 	 * @since   1.6
 	 */
 	public function getModel($name = 'Group', $prefix = 'UsersModel', $config = array())
@@ -39,6 +43,8 @@ public function getModel($name = 'Group', $prefix = 'UsersModel', $config = arra
 	 *
 	 * Overrides JControllerAdmin::delete to check the core.admin permission.
 	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function delete()
@@ -57,6 +63,8 @@ public function delete()
 	 *
 	 * Overrides JControllerAdmin::publish to check the core.admin permission.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function publish()
@@ -75,6 +83,8 @@ public function publish()
 	 *
 	 * Overrides JControllerAdmin::reorder to check the core.admin permission.
 	 *
+	 * @return  boolean  True on success
+	 *
 	 * @since   1.6
 	 */
 	public function reorder()
@@ -93,6 +103,8 @@ public function reorder()
 	 *
 	 * Overrides JControllerAdmin::saveorder to check the core.admin permission.
 	 *
+	 * @return  boolean  True on success
+	 *
 	 * @since   1.6
 	 */
 	public function saveorder()
@@ -111,6 +123,8 @@ public function saveorder()
 	 *
 	 * Overrides JControllerAdmin::checkin to check the core.admin permission.
 	 *
+	 * @return  boolean  True on success
+	 *
 	 * @since   1.6
 	 */
 	public function checkin()
diff --git a/administrator/components/com_users/controllers/level.php b/administrator/components/com_users/controllers/level.php
index 0f39162cd07a3..3ec864ce0a82b 100644
--- a/administrator/components/com_users/controllers/level.php
+++ b/administrator/components/com_users/controllers/level.php
@@ -12,9 +12,7 @@
 /**
  * User view level controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerLevel extends JControllerForm
 {
@@ -29,10 +27,11 @@ class UsersControllerLevel extends JControllerForm
 	 *
 	 * Overrides JControllerForm::allowSave to check the core.admin permission.
 	 *
-	 * @param   array   An array of input data.
-	 * @param   string  The name of the key for the primary key.
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	protected function allowSave($data, $key = 'id')
@@ -41,7 +40,13 @@ protected function allowSave($data, $key = 'id')
 	}
 
 	/**
-	 * Method to remove a record.
+	 * Removes an item.
+	 *
+	 * Overrides JControllerAdmin::delete to check the core.admin permission.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
 	 */
 	public function delete()
 	{
diff --git a/administrator/components/com_users/controllers/levels.php b/administrator/components/com_users/controllers/levels.php
index c7f7226f728af..eb6786713bf58 100644
--- a/administrator/components/com_users/controllers/levels.php
+++ b/administrator/components/com_users/controllers/levels.php
@@ -12,9 +12,7 @@
 /**
  * User view levels list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerLevels extends JControllerAdmin
 {
@@ -27,9 +25,15 @@ class UsersControllerLevels extends JControllerAdmin
 	/**
 	 * Proxy for getModel.
 	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
 	 * @since   1.6
 	 */
-	public function getModel($name = 'Level', $prefix = 'UsersModel')
+	public function getModel($name = 'Level', $prefix = 'UsersModel', $config = array())
 	{
 		return parent::getModel($name, $prefix, array('ignore_request' => true));
 	}
diff --git a/administrator/components/com_users/controllers/mail.php b/administrator/components/com_users/controllers/mail.php
index 5a4eb08e5882c..80d5caeb6a721 100644
--- a/administrator/components/com_users/controllers/mail.php
+++ b/administrator/components/com_users/controllers/mail.php
@@ -12,9 +12,7 @@
 /**
  * Users mail controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerMail extends JControllerLegacy
 {
diff --git a/administrator/components/com_users/controllers/note.php b/administrator/components/com_users/controllers/note.php
index 670ef948edd27..c3a863f1c45a9 100644
--- a/administrator/components/com_users/controllers/note.php
+++ b/administrator/components/com_users/controllers/note.php
@@ -12,9 +12,7 @@
 /**
  * User note controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersControllerNote extends JControllerForm
 {
@@ -41,6 +39,7 @@ protected function getRedirectToItemAppend($recordId = null, $key = 'id')
 		$append = parent::getRedirectToItemAppend($recordId, $key);
 
 		$userId = JFactory::getApplication()->input->get('u_id', 0, 'int');
+
 		if ($userId)
 		{
 			$append .= '&u_id=' . $userId;
diff --git a/administrator/components/com_users/controllers/notes.php b/administrator/components/com_users/controllers/notes.php
index d6d671f9a0374..3daaedb758b4b 100644
--- a/administrator/components/com_users/controllers/notes.php
+++ b/administrator/components/com_users/controllers/notes.php
@@ -12,9 +12,7 @@
 /**
  * User notes controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersControllerNotes extends JControllerAdmin
 {
@@ -27,6 +25,8 @@ class UsersControllerNotes extends JControllerAdmin
 	protected $text_prefix = 'COM_USERS_NOTES';
 
 	/**
+	 * Method to get a model object, loading it if required.
+	 *
 	 * @param   string  $name    The model name. Optional.
 	 * @param   string  $prefix  The class prefix. Optional.
 	 * @param   array   $config  Configuration array for model. Optional.
diff --git a/administrator/components/com_users/controllers/user.php b/administrator/components/com_users/controllers/user.php
index 3146f16d2e61e..1de29f2175318 100644
--- a/administrator/components/com_users/controllers/user.php
+++ b/administrator/components/com_users/controllers/user.php
@@ -12,9 +12,7 @@
 /**
  * User controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerUser extends JControllerForm
 {
@@ -54,7 +52,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	/**
 	 * Method to run batch operations.
 	 *
-	 * @param   object   $model  The model.
+	 * @param   object  $model  The model.
 	 *
 	 * @return  boolean  True on success, false on failure
 	 *
diff --git a/administrator/components/com_users/controllers/users.php b/administrator/components/com_users/controllers/users.php
index d6e19df5170c1..d1761f1d5377c 100644
--- a/administrator/components/com_users/controllers/users.php
+++ b/administrator/components/com_users/controllers/users.php
@@ -12,9 +12,7 @@
 /**
  * Users list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersControllerUsers extends JControllerAdmin
 {
@@ -29,8 +27,6 @@ class UsersControllerUsers extends JControllerAdmin
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
-	 * @return  UsersControllerUsers
-	 *
 	 * @since   1.6
 	 * @see     JController
 	 */
diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php
index 327714ac42283..89e94bde5f810 100644
--- a/administrator/components/com_users/helpers/debug.php
+++ b/administrator/components/com_users/helpers/debug.php
@@ -12,9 +12,7 @@
 /**
  * Users component debugging helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersHelperDebug
 {
@@ -22,6 +20,7 @@ class UsersHelperDebug
 	 * Get a list of the components.
 	 *
 	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public static function getComponents()
@@ -62,9 +61,10 @@ public static function getComponents()
 	/**
 	 * Get a list of the actions for the component or code actions.
 	 *
-	 * @param   string    The name of the component.
+	 * @param   string  $component  The name of the component.
 	 *
 	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public static function getDebugActions($component = null)
@@ -109,8 +109,7 @@ public static function getDebugActions($component = null)
 										(string) $action['description']
 									);
 								}
-								break;
-								break;
+
 								break;
 							}
 						}
diff --git a/administrator/components/com_users/helpers/html/users.php b/administrator/components/com_users/helpers/html/users.php
index abeb460891ac4..a658d81e32b8e 100644
--- a/administrator/components/com_users/helpers/html/users.php
+++ b/administrator/components/com_users/helpers/html/users.php
@@ -12,9 +12,7 @@
 /**
  * Extended Utility class for the Users component.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class JHtmlUsers
 {
@@ -200,6 +198,7 @@ public static function activateStates()
 				'inactive_class'	=> 'publish'
 			)
 		);
+
 		return $states;
 	}
 }
diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php
index 5ce363b8783d2..e037057bfde10 100644
--- a/administrator/components/com_users/helpers/users.php
+++ b/administrator/components/com_users/helpers/users.php
@@ -12,9 +12,7 @@
 /**
  * Users component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersHelper
 {
@@ -150,12 +148,13 @@ public static function getGroups()
 		catch (RuntimeException $e)
 		{
 			JError::raiseNotice(500, $e->getMessage());
+
 			return null;
 		}
 
 		foreach ($options as &$option)
 		{
-			$option->text = str_repeat('- ', $option->level).$option->text;
+			$option->text = str_repeat('- ', $option->level) . $option->text;
 		}
 
 		return $options;
@@ -180,6 +179,7 @@ public static function getRangeOptions()
 			JHtml::_('select.option', 'past_year', JText::_('COM_USERS_OPTION_RANGE_PAST_YEAR')),
 			JHtml::_('select.option', 'post_year', JText::_('COM_USERS_OPTION_RANGE_POST_YEAR')),
 		);
+
 		return $options;
 	}
 
diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php
index 98bda3e5fe85a..dc0ded7a2d05d 100644
--- a/administrator/components/com_users/models/debuggroup.php
+++ b/administrator/components/com_users/models/debuggroup.php
@@ -14,9 +14,7 @@
 /**
  * Methods supporting a list of user records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelDebuggroup extends JModelList
 {
@@ -24,6 +22,7 @@ class UsersModelDebuggroup extends JModelList
 	 * Get a list of the actions.
 	 *
 	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public function getDebugActions()
@@ -37,6 +36,7 @@ public function getDebugActions()
 	 * Override getItems method.
 	 *
 	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public function getItems()
@@ -45,7 +45,6 @@ public function getItems()
 
 		if (($assets = parent::getItems()) && $groupId)
 		{
-
 			$actions = $this->getDebugActions();
 
 			foreach ($assets as &$asset)
@@ -80,7 +79,11 @@ public function getItems()
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -89,6 +92,7 @@ protected function populateState($ordering = null, $direction = null)
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');
+
 		if ($layout)
 		{
 			$this->context .= '.' . $layout;
@@ -105,10 +109,12 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.level_start', $levelStart);
 
 		$value = $this->getUserStateFromRequest($this->context . '.filter.level_end', 'filter_level_end', 0, 'int');
+
 		if ($value > 0 && $value < $levelStart)
 		{
 			$value = $levelStart;
 		}
+
 		$this->setState('filter.level_end', $value);
 
 		$component = $this->getUserStateFromRequest($this->context . '.filter.component', 'filter_component');
@@ -129,10 +135,9 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
-	 * @since   1.6
 	 */
 	protected function getStoreId($id = '')
 	{
@@ -149,6 +154,7 @@ protected function getStoreId($id = '')
 	 * Get the group being debugged.
 	 *
 	 * @return  JObject
+	 *
 	 * @since   1.6
 	 */
 	public function getGroup()
@@ -170,6 +176,7 @@ public function getGroup()
 		catch (RuntimeException $e)
 		{
 			$this->setError($e->getMessage());
+
 			return false;
 		}
 
@@ -180,6 +187,7 @@ public function getGroup()
 	 * Build an SQL query to load the list data.
 	 *
 	 * @return  JDatabaseQuery
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -215,14 +223,17 @@ protected function getListQuery()
 		// Filter on the start and end levels.
 		$levelStart = (int) $this->getState('filter.level_start');
 		$levelEnd = (int) $this->getState('filter.level_end');
+
 		if ($levelEnd > 0 && $levelEnd < $levelStart)
 		{
 			$levelEnd = $levelStart;
 		}
+
 		if ($levelStart > 0)
 		{
 			$query->where('a.level >= ' . $levelStart);
 		}
+
 		if ($levelEnd > 0)
 		{
 			$query->where('a.level <= ' . $levelEnd);
diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php
index ec0251237d9bc..491395a79757d 100644
--- a/administrator/components/com_users/models/debuguser.php
+++ b/administrator/components/com_users/models/debuguser.php
@@ -14,9 +14,7 @@
 /**
  * Methods supporting a list of user records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelDebugUser extends JModelList
 {
@@ -24,6 +22,7 @@ class UsersModelDebugUser extends JModelList
 	 * Get a list of the actions.
 	 *
 	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public function getDebugActions()
@@ -37,6 +36,7 @@ public function getDebugActions()
 	 * Override getItems method.
 	 *
 	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public function getItems()
@@ -45,7 +45,6 @@ public function getItems()
 
 		if (($assets = parent::getItems()) && $userId)
 		{
-
 			$actions = $this->getDebugActions();
 
 			foreach ($assets as &$asset)
@@ -80,7 +79,11 @@ public function getItems()
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -89,6 +92,7 @@ protected function populateState($ordering = null, $direction = null)
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');
+
 		if ($layout)
 		{
 			$this->context .= '.' . $layout;
@@ -105,10 +109,12 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.level_start', $levelStart);
 
 		$value = $this->getUserStateFromRequest($this->context . '.filter.level_end', 'filter_level_end', 0, 'int');
+
 		if ($value > 0 && $value < $levelStart)
 		{
 			$value = $levelStart;
 		}
+
 		$this->setState('filter.level_end', $value);
 
 		$component = $this->getUserStateFromRequest($this->context . '.filter.component', 'filter_component');
@@ -129,10 +135,9 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
-	 * @since   1.6
 	 */
 	protected function getStoreId($id = '')
 	{
@@ -150,6 +155,7 @@ protected function getStoreId($id = '')
 	 * Get the user being debugged.
 	 *
 	 * @return  JUser
+	 *
 	 * @since   1.6
 	 */
 	public function getUser()
@@ -163,6 +169,7 @@ public function getUser()
 	 * Build an SQL query to load the list data.
 	 *
 	 * @return  JDatabaseQuery
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -205,14 +212,17 @@ protected function getListQuery()
 		// Filter on the start and end levels.
 		$levelStart = (int) $this->getState('filter.level_start');
 		$levelEnd = (int) $this->getState('filter.level_end');
+
 		if ($levelEnd > 0 && $levelEnd < $levelStart)
 		{
 			$levelEnd = $levelStart;
 		}
+
 		if ($levelStart > 0)
 		{
 			$query->where('a.level >= ' . $levelStart);
 		}
+
 		if ($levelEnd > 0)
 		{
 			$query->where('a.level <= ' . $levelEnd);
diff --git a/administrator/components/com_users/models/fields/groupparent.php b/administrator/components/com_users/models/fields/groupparent.php
index 3956d5e1f0106..4db6ae086d028 100644
--- a/administrator/components/com_users/models/fields/groupparent.php
+++ b/administrator/components/com_users/models/fields/groupparent.php
@@ -14,9 +14,7 @@
 /**
  * Form Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldGroupParent extends JFormFieldList
 {
@@ -31,7 +29,8 @@ class JFormFieldGroupParent extends JFormFieldList
 	/**
 	 * Method to get the field options.
 	 *
-	 * @return  array  The field option objects.
+	 * @return  array  The field option objects
+	 *
 	 * @since   1.6
 	 */
 	protected function getOptions()
diff --git a/administrator/components/com_users/models/group.php b/administrator/components/com_users/models/group.php
index e3d4f2fc85506..53844144f824a 100644
--- a/administrator/components/com_users/models/group.php
+++ b/administrator/components/com_users/models/group.php
@@ -12,9 +12,7 @@
 /**
  * User group model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelGroup extends JModelAdmin
 {
@@ -33,30 +31,36 @@ class UsersModelGroup extends JModelAdmin
 	/**
 	 * Returns a reference to the a Table object, always creating it.
 	 *
-	 * @param   type	The table type to instantiate
-	 * @param   string	A prefix for the table class name. Optional.
-	 * @param   array  Configuration array for model. Optional.
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
 	 * @return  JTable	A database object
+	 *
 	 * @since   1.6
-	*/
+	 */
 	public function getTable($type = 'Usergroup', $prefix = 'JTable', $config = array())
 	{
 		$return = JTable::getInstance($type, $prefix, $config);
+
 		return $return;
 	}
 
 	/**
 	 * Method to get the record form.
 	 *
-	 * @param   array  $data		An optional array of data for the form to interogate.
-	 * @param   boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
 	 * @return  JForm	A JForm object on success, false on failure
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Get the form.
 		$form = $this->loadForm('com_users.group', 'group', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -69,6 +73,7 @@ public function getForm($data = array(), $loadData = true)
 	 * Method to get the data that should be injected in the form.
 	 *
 	 * @return  mixed  The data for the form.
+	 *
 	 * @since   1.6
 	 */
 	protected function loadFormData()
@@ -89,27 +94,35 @@ protected function loadFormData()
 	/**
 	 * Override preprocessForm to load the user plugin group instead of content.
 	 *
-	 * @param   object	A form object.
-	 * @param   mixed	The data expected for the form.
-	 * @throws	Exception if there is an error in the form event.
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
 	 */
-	protected function preprocessForm(JForm $form, $data, $groups = '')
+	protected function preprocessForm(JForm $form, $data, $group = '')
 	{
 		$obj = is_array($data) ? JArrayHelper::toObject($data, 'JObject') : $data;
+
 		if (isset($obj->parent_id) && $obj->parent_id == 0 && $obj->id > 0)
 		{
 			$form->setFieldAttribute('parent_id', 'type', 'hidden');
 			$form->setFieldAttribute('parent_id', 'hidden', 'true');
 		}
+
 		parent::preprocessForm($form, $data, 'user');
 	}
 
 	/**
 	 * Method to save the form data.
 	 *
-	 * @param   array  The form data.
+	 * @param   array  $data  The form data.
+	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   1.6
 	 */
 	public function save($data)
@@ -117,12 +130,16 @@ public function save($data)
 		// Include the content plugins for events.
 		JPluginHelper::importPlugin('user');
 
-		// Check the super admin permissions for group
-		// We get the parent group permissions and then check the group permissions manually
-		// We have to calculate the group permissions manually because we haven't saved the group yet
+		/**
+		 * Check the super admin permissions for group
+		 * We get the parent group permissions and then check the group permissions manually
+		 * We have to calculate the group permissions manually because we haven't saved the group yet
+		 */
 		$parentSuperAdmin = JAccess::checkGroup($data['parent_id'], 'core.admin');
+
 		// Get core.admin rules from the root asset
 		$rules = JAccess::getAssetRules('root.1')->getData('core.admin');
+
 		// Get the value for the current group (will be true (allowed), false (denied), or null (inherit)
 		$groupSuperAdmin = $rules['core.admin']->allow($data['id']);
 
@@ -140,6 +157,7 @@ public function save($data)
 
 		// Check for non-super admin trying to save with super admin group
 		$iAmSuperAdmin	= JFactory::getUser()->authorise('core.admin');
+
 		if ((!$iAmSuperAdmin) && ($groupSuperAdmin))
 		{
 			try
@@ -149,27 +167,35 @@ public function save($data)
 			catch (Exception $e)
 			{
 				$this->setError($e->getMessage());
+
 				return false;
 			}
 		}
 
-		// Check for super-admin changing self to be non-super-admin
-		// First, are we a super admin>
+		/**
+		 * Check for super-admin changing self to be non-super-admin
+		 * First, are we a super admin
+		 */
 		if ($iAmSuperAdmin)
 		{
 			// Next, are we a member of the current group?
 			$myGroups = JAccess::getGroupsByUser(JFactory::getUser()->get('id'), false);
+
 			if (in_array($data['id'], $myGroups))
 			{
 				// Now, would we have super admin permissions without the current group?
 				$otherGroups = array_diff($myGroups, array($data['id']));
 				$otherSuperAdmin = false;
+
 				foreach ($otherGroups as $otherGroup)
 				{
 					$otherSuperAdmin = ($otherSuperAdmin) ? $otherSuperAdmin : JAccess::checkGroup($otherGroup, 'core.admin');
 				}
-				// If we would not otherwise have super admin permissions
-				// and the current group does not have super admin permissions, throw an exception
+
+				/**
+				 * If we would not otherwise have super admin permissions
+				 * and the current group does not have super admin permissions, throw an exception
+				 */
 				if ((!$otherSuperAdmin) && (!$groupSuperAdmin))
 				{
 					try
@@ -179,6 +205,7 @@ public function save($data)
 					catch (Exception $e)
 					{
 						$this->setError($e->getMessage());
+
 						return false;
 					}
 				}
@@ -192,9 +219,12 @@ public function save($data)
 	/**
 	 * Method to delete rows.
 	 *
-	 * @param   array  An array of item ids.
+	 * @param   array  &$pks  An array of item ids.
+	 *
 	 * @return  boolean  Returns true on success, false on failure.
+	 *
 	 * @since   1.6
+	 * @throws  Exception
 	 */
 	public function delete(&$pks)
 	{
@@ -213,12 +243,13 @@ public function delete(&$pks)
 		// Check if I am a Super Admin
 		$iAmSuperAdmin	= $user->authorise('core.admin');
 
-		// do not allow to delete groups to which the current user belongs
+		// Do not allow to delete groups to which the current user belongs
 		foreach ($pks as $pk)
 		{
 			if (in_array($pk, $groups))
 			{
 				JError::raiseWarning(403, JText::_('COM_USERS_DELETE_ERROR_INVALID_GROUP'));
+
 				return false;
 			}
 		}
@@ -229,6 +260,7 @@ public function delete(&$pks)
 			{
 				// Access checks.
 				$allow = $user->authorise('core.edit.state', 'com_users');
+
 				// Don't allow non-super-admin to delete a super admin
 				$allow = (!$iAmSuperAdmin && JAccess::checkGroup($pk, 'core.admin')) ? false : $allow;
 
@@ -240,18 +272,26 @@ public function delete(&$pks)
 					if (!$table->delete($pk))
 					{
 						$this->setError($table->getError());
+
 						return false;
-					} else {
+					}
+					else
+					{
 						// Trigger the onUserAfterDeleteGroup event.
 						$dispatcher->trigger('onUserAfterDeleteGroup', array($table->getProperties(), true, $this->getError()));
 					}
-				} else {
+				}
+				else
+				{
 					// Prune items that you can't change.
 					unset($pks[$i]);
 					JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
 				}
-			} else {
+			}
+			else
+			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 		}
diff --git a/administrator/components/com_users/models/groups.php b/administrator/components/com_users/models/groups.php
index 5c1e833950275..17ffd78729a2b 100644
--- a/administrator/components/com_users/models/groups.php
+++ b/administrator/components/com_users/models/groups.php
@@ -12,16 +12,15 @@
 /**
  * Methods supporting a list of user group records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelGroups extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -46,6 +45,11 @@ public function __construct($config = array())
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -69,7 +73,7 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
 	 */
@@ -86,11 +90,13 @@ protected function getStoreId($id = '')
 	 * Gets the list of groups and adds expensive joins to the result set.
 	 *
 	 * @return  mixed  An array of data items on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function getItems()
 	{
 		$db = $this->getDbo();
+
 		// Get a storage key.
 		$store = $this->getStoreId();
 
@@ -109,6 +115,7 @@ public function getItems()
 
 			// First pass: get list of the group id's and reset the counts.
 			$groupIds = array();
+
 			foreach ($items as $item)
 			{
 				$groupIds[] = (int) $item->id;
@@ -134,6 +141,7 @@ public function getItems()
 			catch (RuntimeException $e)
 			{
 				$this->setError($e->getMessage());
+
 				return false;
 			}
 
@@ -180,6 +188,7 @@ protected function getListQuery()
 
 		// Filter the comments over the search string if set.
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -196,7 +205,6 @@ protected function getListQuery()
 		// Add the list ordering clause.
 		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 }
diff --git a/administrator/components/com_users/models/level.php b/administrator/components/com_users/models/level.php
index bb84c913a5fd8..ac9c00d796808 100644
--- a/administrator/components/com_users/models/level.php
+++ b/administrator/components/com_users/models/level.php
@@ -12,9 +12,7 @@
 /**
  * User view level model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelLevel extends JModelAdmin
 {
@@ -27,9 +25,10 @@ class UsersModelLevel extends JModelAdmin
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
-	 * @param   object	$record	A record object.
+	 * @param   object  $record  A record object.
 	 *
 	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
 	 * @since   1.6
 	 */
 	protected function canDelete($record)
@@ -43,11 +42,10 @@ protected function canDelete($record)
 			$db		= $this->getDbo();
 			$query	= $db->getQuery(true)
 				->select('DISTINCT access');
-				// from is added dynamically
 
 			// Get all the tables and the prefix
 			$tables = $db->getTableList();
-			//$fields = $db->getTableFields($tables);
+
 			$prefix = $db->getPrefix();
 
 			foreach ($tables as $table)
@@ -55,9 +53,11 @@ protected function canDelete($record)
 				// Get all of the columns in the table
 				$fields = $db->getTableColumns($table);
 
-				// We are looking for the access field.  If custom tables are using something other
-				// than the 'access' field they are on their own unfortunately.
-				// Also make sure the table prefix matches the live db prefix (eg, it is not a "bak_" table)
+				/**
+				 * We are looking for the access field.  If custom tables are using something other
+				 * than the 'access' field they are on their own unfortunately.
+				 * Also make sure the table prefix matches the live db prefix (eg, it is not a "bak_" table)
+				 */
 				if ((strpos($table, $prefix) === 0) && (isset($fields['access'])))
 				{
 					// Lookup the distinct values of the field.
@@ -72,6 +72,7 @@ protected function canDelete($record)
 					catch (RuntimeException $e)
 					{
 						$this->setError($e->getMessage());
+
 						return false;
 					}
 
@@ -101,12 +102,14 @@ protected function canDelete($record)
 	/**
 	 * Returns a reference to the a Table object, always creating it.
 	 *
-	 * @param   type	The table type to instantiate
-	 * @param   string	A prefix for the table class name. Optional.
-	 * @param   array  Configuration array for model. Optional.
-	 * @return  JTable	A database object
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
 	 * @since   1.6
-	*/
+	 */
 	public function getTable($type = 'Viewlevel', $prefix = 'JTable', $config = array())
 	{
 		$return = JTable::getInstance($type, $prefix, $config);
@@ -117,8 +120,10 @@ public function getTable($type = 'Viewlevel', $prefix = 'JTable', $config = arra
 	/**
 	 * Method to get a single record.
 	 *
-	 * @param   integer	The id of the primary key.
+	 * @param   integer  $pk  The id of the primary key.
+	 *
 	 * @return  mixed  Object on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function getItem($pk = null)
@@ -134,9 +139,11 @@ public function getItem($pk = null)
 	/**
 	 * Method to get the record form.
 	 *
-	 * @param   array  $data		An optional array of data for the form to interogate.
-	 * @param   boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
 	 * @return  JForm	A JForm object on success, false on failure
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
@@ -156,6 +163,7 @@ public function getForm($data = array(), $loadData = true)
 	 * Method to get the data that should be injected in the form.
 	 *
 	 * @return  mixed  The data for the form.
+	 *
 	 * @since   1.6
 	 */
 	protected function loadFormData()
@@ -174,14 +182,18 @@ protected function loadFormData()
 	}
 
 	/**
-	 * Override preprocessForm to load the user plugin group instead of content.
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
 	 *
-	 * @param   object	A form object.
-	 * @param   mixed	The data expected for the form.
-	 * @throws	Exception if there is an error in the form event.
 	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
 	 */
-	protected function preprocessForm(JForm $form, $data, $groups = '')
+	protected function preprocessForm(JForm $form, $data, $group = '')
 	{
 		parent::preprocessForm($form, $data, 'user');
 	}
@@ -189,8 +201,10 @@ protected function preprocessForm(JForm $form, $data, $groups = '')
 	/**
 	 * Method to save the form data.
 	 *
-	 * @param   array  The form data.
+	 * @param   array  $data  The form data.
+	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   1.6
 	 */
 	public function save($data)
diff --git a/administrator/components/com_users/models/levels.php b/administrator/components/com_users/models/levels.php
index d940e316a0660..a6af463daceb2 100644
--- a/administrator/components/com_users/models/levels.php
+++ b/administrator/components/com_users/models/levels.php
@@ -12,16 +12,15 @@
 /**
  * Methods supporting a list of user access level records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelLevels extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -44,6 +43,11 @@ public function __construct($config = array())
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -67,7 +71,7 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
 	 */
@@ -104,6 +108,7 @@ protected function getListQuery()
 
 		// Filter the items over the search string if set.
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -122,15 +127,15 @@ protected function getListQuery()
 		// Add the list ordering clause.
 		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 
-		//echo nl2br(str_replace('#__','jos_',$query));
 		return $query;
 	}
 
 	/**
 	 * Method to adjust the ordering of a row.
 	 *
-	 * @param   integer    The ID of the primary key to move.
-	 * @param   integer    Increment, usually +1 or -1
+	 * @param   integer  $pk         The ID of the primary key to move.
+	 * @param   integer  $direction  Increment, usually +1 or -1
+	 *
 	 * @return  boolean  False on failure or error, true otherwise.
 	 */
 	public function reorder($pk, $direction = 0)
@@ -146,6 +151,7 @@ public function reorder($pk, $direction = 0)
 		if (!$table->load($pk))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -155,6 +161,7 @@ public function reorder($pk, $direction = 0)
 		if (!$allow)
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+
 			return false;
 		}
 
@@ -168,8 +175,10 @@ public function reorder($pk, $direction = 0)
 	/**
 	 * Saves the manually set order of records.
 	 *
-	 * @param   array    An array of primary key ids.
-	 * @param   integer  +/-1
+	 * @param   array    $pks    An array of primary key ids.
+	 * @param   integer  $order  Order position
+	 *
+	 * @return   boolean
 	 */
 	public function saveorder($pks, $order)
 	{
@@ -182,7 +191,7 @@ public function saveorder($pks, $order)
 			return JError::raiseWarning(500, JText::_('COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED'));
 		}
 
-		// update ordering values
+		// Update ordering values
 		foreach ($pks as $i => $pk)
 		{
 			$table->load((int) $pk);
@@ -199,9 +208,11 @@ public function saveorder($pks, $order)
 			elseif ($table->ordering != $order[$i])
 			{
 				$table->ordering = $order[$i];
+
 				if (!$table->store())
 				{
 					$this->setError($table->getError());
+
 					return false;
 				}
 			}
diff --git a/administrator/components/com_users/models/mail.php b/administrator/components/com_users/models/mail.php
index 359d9c9d8b6e4..976a92f5012fd 100644
--- a/administrator/components/com_users/models/mail.php
+++ b/administrator/components/com_users/models/mail.php
@@ -12,20 +12,18 @@
 /**
  * Users mail model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelMail extends JModelAdmin
 {
 	/**
 	 * Method to get the row form.
 	 *
-	 * @param   array  $data		An optional array of data for the form to interogate.
-	 * @param   boolean	$loadData	True if the form is to load its own data (default case), false if not.
-	 * 
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
 	 * @return  JForm	A JForm object on success, false on failure
-	 * 
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
@@ -45,7 +43,7 @@ public function getForm($data = array(), $loadData = true)
 	 * Method to get the data that should be injected in the form.
 	 *
 	 * @return  mixed  The data for the form.
-	 * 
+	 *
 	 * @since   1.6
 	 */
 	protected function loadFormData()
@@ -59,20 +57,27 @@ protected function loadFormData()
 	}
 
 	/**
-	 * Override preprocessForm to load the user plugin group instead of content.
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
 	 *
-	 * @param   object	A form object.
-	 * @param   mixed	The data expected for the form.
-	 * 
-	 * @throws	Exception if there is an error in the form event.
-	 * 
 	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
 	 */
 	protected function preprocessForm(JForm $form, $data, $group = 'user')
 	{
 		parent::preprocessForm($form, $data, $group);
 	}
 
+	/**
+	 * Send the email
+	 *
+	 * @return  boolean
+	 */
 	public function send()
 	{
 		$app    = JFactory::getApplication();
@@ -89,7 +94,7 @@ public function send()
 		$disabled     = array_key_exists('disabled', $data) ? (int) $data['disabled'] : 0;
 		$message_body = array_key_exists('message', $data) ? $data['message'] : '';
 
-		// automatically removes html formatting
+		// Automatically removes html formatting
 		if (!$mode)
 		{
 			$message_body = JFilterInput::getInstance()->clean($message_body, 'string');
@@ -104,14 +109,14 @@ public function send()
 			return false;
 		}
 
-		// get users in the group out of the acl
+		// Get users in the group out of the ACL
 		$to = $access->getUsersByGroup($grp, $recurse);
 
 		// Get all users email and group except for senders
 		$query	= $db->getQuery(true)
 			->select('email')
 			->from('#__users')
-			->where('id != '.(int) $user->get('id'));
+			->where('id != ' . (int) $user->get('id'));
 
 		if ($grp !== 0)
 		{
@@ -191,9 +196,11 @@ public function send()
 		}
 		else
 		{
-			// Fill the data (specially for the 'mode', 'group' and 'bcc': they could not exist in the array
-			// when the box is not checked and in this case, the default value would be used instead of the '0'
-			// one)
+			/**
+			 * Fill the data (specially for the 'mode', 'group' and 'bcc': they could not exist in the array
+			 * when the box is not checked and in this case, the default value would be used instead of the '0'
+			 * one)
+			 */
 			$data['mode']    = $mode;
 			$data['subject'] = $subject;
 			$data['group']   = $grp;
diff --git a/administrator/components/com_users/models/note.php b/administrator/components/com_users/models/note.php
index d89ee4a842662..c347c1030ae0e 100644
--- a/administrator/components/com_users/models/note.php
+++ b/administrator/components/com_users/models/note.php
@@ -12,13 +12,10 @@
 /**
  * User note model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersModelNote extends JModelAdmin
 {
-
 	/**
 	 * The type alias for this content type.
 	 *
@@ -41,6 +38,7 @@ public function getForm($data = array(), $loadData = true)
 	{
 		// Get the form.
 		$form = $this->loadForm('com_users.note', 'note', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -142,54 +140,4 @@ protected function populateState()
 		$userId = JFactory::getApplication()->input->get('u_id', 0, 'int');
 		$this->setState('note.user_id', $userId);
 	}
-
-	/**
-	 * Method to save the form data.
-	 *
-	 * @param   array  $data  The form data.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   2.5
-	 */
-	/*public function save($data)
-	{
-		$pk		= (!empty($data['id'])) ? $data['id'] : (int) $this->getState('note.id');
-		$table	= $this->getTable();
-		$isNew	= empty($pk);
-
-		if (!$table->bind($data))
-		{
-			$this->setError($table->getError());
-
-			return false;
-		}
-
-		// JTableCategory doesn't bind the params, so we need to do that by hand.
-		if (isset($data['params']) && is_array($data['params']))
-		{
-			$registry = new JRegistry();
-			$registry->loadArray($data['params']);
-			$table->params = $registry->toString();
-			// This will give us INI format.
-		}
-
-		if (!$table->check())
-		{
-			$this->setError($table->getError());
-
-			return false;
-		}
-
-		if (!$table->store())
-		{
-			$this->setError($table->getError());
-
-			return false;
-		}
-
-		$this->setState('note.id', $table->id);
-
-		return true;
-	}*/
 }
diff --git a/administrator/components/com_users/models/notes.php b/administrator/components/com_users/models/notes.php
index 34ef977324e54..75d1fdfbad34c 100644
--- a/administrator/components/com_users/models/notes.php
+++ b/administrator/components/com_users/models/notes.php
@@ -12,16 +12,14 @@
 /**
  * User notes model class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersModelNotes extends JModelList
 {
 	/**
 	 * Class constructor.
 	 *
-	 * @param  array  $config  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
 	 * @since  2.5
 	 */
@@ -89,6 +87,7 @@ protected function getListQuery()
 
 		// Filter by search in title
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -108,16 +107,19 @@ protected function getListQuery()
 
 		// Filter by published state
 		$published = $this->getState('filter.state');
+
 		if (is_numeric($published))
 		{
-			$query->where('a.state = '.(int) $published);
-		} elseif ($published === '')
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
 		{
 			$query->where('(a.state IN (0, 1))');
 		}
 
 		// Filter by a single or group of categories.
 		$categoryId = (int) $this->getState('filter.category_id');
+
 		if ($categoryId)
 		{
 			if (is_scalar($section))
@@ -128,6 +130,7 @@ protected function getListQuery()
 
 		// Filter by a single user.
 		$userId = (int) $this->getState('filter.user_id');
+
 		if ($userId)
 		{
 			// Add the body and where filter.
@@ -179,6 +182,7 @@ public function getUser()
 
 		// Filter by search in title
 		$search = JFactory::getApplication()->input->get('u_id', 0, 'int');
+
 		if ($search != 0)
 		{
 			$user->load((int) $search);
@@ -192,6 +196,9 @@ public function getUser()
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
 	 * @return  void
 	 *
 	 * @since   1.6
@@ -210,7 +217,7 @@ protected function populateState($ordering = null, $direction = null)
 		$value = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
 		$this->setState('filter.search', $value);
 
-		$published = $this->getUserStateFromRequest($this->context.'.filter.state', 'filter_published', '', 'string');
+		$published = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string');
 		$this->setState('filter.state', $published);
 
 		$section = $app->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php
index 21ce4bb330bcf..fc8bf17cd73fe 100644
--- a/administrator/components/com_users/models/user.php
+++ b/administrator/components/com_users/models/user.php
@@ -12,9 +12,7 @@
 /**
  * User model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelUser extends JModelAdmin
 {
@@ -46,7 +44,7 @@ public function __construct($config = array())
 	 * @return  JTable  A database object
 	 *
 	 * @since   1.6
-	*/
+	 */
 	public function getTable($type = 'User', $prefix = 'JTable', $config = array())
 	{
 		$table = JTable::getInstance($type, $prefix, $config);
diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php
index dd6d47f97e9da..48454af40949a 100644
--- a/administrator/components/com_users/models/users.php
+++ b/administrator/components/com_users/models/users.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of user records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersModelUsers extends JModelList
 {
diff --git a/administrator/components/com_users/tables/note.php b/administrator/components/com_users/tables/note.php
index 32120980cbc22..57da10c7dbe18 100644
--- a/administrator/components/com_users/tables/note.php
+++ b/administrator/components/com_users/tables/note.php
@@ -12,16 +12,14 @@
 /**
  * User notes table class
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersTableNote extends JTable
 {
 	/**
 	 * Constructor
 	 *
-	 * @param  JDatabaseDriver  &$db  Database object
+	 * @param   JDatabaseDriver  &$db  Database object
 	 *
 	 * @since  2.5
 	 */
@@ -97,6 +95,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			else
 			{
 				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
 				return false;
 			}
 		}
@@ -129,6 +128,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		catch (RuntimeException $e)
 		{
 			$this->setError($this->_db->getMessage());
+
 			return false;
 		}
 
@@ -149,6 +149,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		}
 
 		$this->setError('');
+
 		return true;
 	}
 }
diff --git a/administrator/components/com_users/views/debuggroup/view.html.php b/administrator/components/com_users/views/debuggroup/view.html.php
index 1d4cf24fcfa53..45ed07e1d35e0 100644
--- a/administrator/components/com_users/views/debuggroup/view.html.php
+++ b/administrator/components/com_users/views/debuggroup/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of users.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewDebuggroup extends JViewLegacy
 {
@@ -46,6 +44,10 @@ class UsersViewDebuggroup extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -67,6 +69,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -78,6 +81,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/debuguser/view.html.php b/administrator/components/com_users/views/debuguser/view.html.php
index 5a994f927abd1..8edc606a9e692 100644
--- a/administrator/components/com_users/views/debuguser/view.html.php
+++ b/administrator/components/com_users/views/debuguser/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of users.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewDebuguser extends JViewLegacy
 {
@@ -46,6 +44,10 @@ class UsersViewDebuguser extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -67,6 +69,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -78,6 +81,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/group/view.html.php b/administrator/components/com_users/views/group/view.html.php
index 8355c66344e8f..39c520ea052aa 100644
--- a/administrator/components/com_users/views/group/view.html.php
+++ b/administrator/components/com_users/views/group/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a user group.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewGroup extends JViewLegacy
 {
@@ -38,6 +36,10 @@ class UsersViewGroup extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -49,6 +51,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -59,6 +62,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/groups/view.html.php b/administrator/components/com_users/views/groups/view.html.php
index a74f14b5e6413..2b5a88b0a1c72 100644
--- a/administrator/components/com_users/views/groups/view.html.php
+++ b/administrator/components/com_users/views/groups/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of user groups.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewGroups extends JViewLegacy
 {
@@ -44,6 +42,10 @@ class UsersViewGroups extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -57,6 +59,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -68,6 +71,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/level/view.html.php b/administrator/components/com_users/views/level/view.html.php
index 28e8884bf1bc6..f0045ae07ede8 100644
--- a/administrator/components/com_users/views/level/view.html.php
+++ b/administrator/components/com_users/views/level/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a user view level.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewLevel extends JViewLegacy
 {
@@ -38,6 +36,10 @@ class UsersViewLevel extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -49,6 +51,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -59,6 +62,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/levels/view.html.php b/administrator/components/com_users/views/levels/view.html.php
index d5b84528736d9..71c36bbe5d616 100644
--- a/administrator/components/com_users/views/levels/view.html.php
+++ b/administrator/components/com_users/views/levels/view.html.php
@@ -12,9 +12,7 @@
 /**
  * The HTML Users access levels view.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewLevels extends JViewLegacy
 {
@@ -44,6 +42,10 @@ class UsersViewLevels extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -57,6 +59,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -68,6 +71,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/mail/view.html.php b/administrator/components/com_users/views/mail/view.html.php
index 5a73d6d1c3696..827dbc0ac52ff 100644
--- a/administrator/components/com_users/views/mail/view.html.php
+++ b/administrator/components/com_users/views/mail/view.html.php
@@ -12,8 +12,7 @@
 /**
  * Users mail view.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
+ * @since  1.6
  */
 class UsersViewMail extends JViewLegacy
 {
@@ -24,6 +23,10 @@ class UsersViewMail extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -37,6 +40,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/note/view.html.php b/administrator/components/com_users/views/note/view.html.php
index 7b63fe6954ae0..54526f958df54 100644
--- a/administrator/components/com_users/views/note/view.html.php
+++ b/administrator/components/com_users/views/note/view.html.php
@@ -12,9 +12,7 @@
 /**
  * User note edit view
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersViewNote extends JViewLegacy
 {
diff --git a/administrator/components/com_users/views/notes/view.html.php b/administrator/components/com_users/views/notes/view.html.php
index 3815a7255eece..6283ac34d6970 100644
--- a/administrator/components/com_users/views/notes/view.html.php
+++ b/administrator/components/com_users/views/notes/view.html.php
@@ -12,9 +12,7 @@
 /**
  * User notes list view
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       2.5
+ * @since  2.5
  */
 class UsersViewNotes extends JViewLegacy
 {
@@ -78,7 +76,7 @@ public function display($tpl = null)
 		// Get the component HTML helpers
 		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
-		// turn parameters into registry objects
+		// Turn parameters into registry objects
 		foreach ($this->items as $item)
 		{
 			$item->cparams = new JRegistry;
@@ -140,6 +138,7 @@ protected function addToolbar()
 			JToolbarHelper::preferences('com_users');
 			JToolbarHelper::divider();
 		}
+
 		JToolbarHelper::help('JHELP_USERS_USER_NOTES');
 
 		JHtmlSidebar::setAction('index.php?option=com_users&view=notes');
diff --git a/administrator/components/com_users/views/user/view.html.php b/administrator/components/com_users/views/user/view.html.php
index 6b4665230c356..64b831f461a05 100644
--- a/administrator/components/com_users/views/user/view.html.php
+++ b/administrator/components/com_users/views/user/view.html.php
@@ -10,9 +10,9 @@
 defined('_JEXEC') or die;
 
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.5
+ * User view class.
+ * 
+ * @since  1.5
  */
 class UsersViewUser extends JViewLegacy
 {
@@ -29,7 +29,11 @@ class UsersViewUser extends JViewLegacy
 	/**
 	 * Display the view
 	 *
-	 * @since  1.5
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
 	 */
 	public function display($tpl = null)
 	{
@@ -45,6 +49,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -58,6 +63,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
diff --git a/administrator/components/com_users/views/users/view.html.php b/administrator/components/com_users/views/users/view.html.php
index 11c18894e31e2..698238218e611 100644
--- a/administrator/components/com_users/views/users/view.html.php
+++ b/administrator/components/com_users/views/users/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of users.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_users
- * @since       1.6
+ * @since  1.6
  */
 class UsersViewUsers extends JViewLegacy
 {
diff --git a/administrator/components/com_weblinks/controller.php b/administrator/components/com_weblinks/controller.php
index 02d89150af83c..c2205955aff5e 100644
--- a/administrator/components/com_weblinks/controller.php
+++ b/administrator/components/com_weblinks/controller.php
@@ -12,9 +12,7 @@
 /**
  * Weblinks Weblink Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.5
+ * @since  1.5
  */
 class WeblinksController extends JControllerLegacy
 {
diff --git a/administrator/components/com_weblinks/controllers/weblink.php b/administrator/components/com_weblinks/controllers/weblink.php
index 2361894cae9f5..7c2540e2284b8 100644
--- a/administrator/components/com_weblinks/controllers/weblink.php
+++ b/administrator/components/com_weblinks/controllers/weblink.php
@@ -12,9 +12,7 @@
 /**
  * Weblink controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.6
+ * @since  1.6
  */
 class WeblinksControllerWeblink extends JControllerForm
 {
diff --git a/administrator/components/com_weblinks/controllers/weblinks.php b/administrator/components/com_weblinks/controllers/weblinks.php
index f78b72b2d779b..f41136b1c76e8 100644
--- a/administrator/components/com_weblinks/controllers/weblinks.php
+++ b/administrator/components/com_weblinks/controllers/weblinks.php
@@ -12,9 +12,7 @@
 /**
  * Weblinks list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.6
+ * @since  1.6
  */
 class WeblinksControllerWeblinks extends JControllerAdmin
 {
diff --git a/administrator/components/com_weblinks/helpers/weblinks.php b/administrator/components/com_weblinks/helpers/weblinks.php
index 550a87c95bda8..cc765b4ded6bf 100644
--- a/administrator/components/com_weblinks/helpers/weblinks.php
+++ b/administrator/components/com_weblinks/helpers/weblinks.php
@@ -12,9 +12,7 @@
 /**
  * Weblinks helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.6
+ * @since  1.6
  */
 class WeblinksHelper extends JHelperContent
 {
diff --git a/administrator/components/com_weblinks/models/weblink.php b/administrator/components/com_weblinks/models/weblink.php
index 5742581e5db70..1aea25f7fdd72 100644
--- a/administrator/components/com_weblinks/models/weblink.php
+++ b/administrator/components/com_weblinks/models/weblink.php
@@ -12,9 +12,7 @@
 /**
  * Weblinks model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.5
+ * @since  1.5
  */
 class WeblinksModelWeblink extends JModelAdmin
 {
diff --git a/administrator/components/com_weblinks/models/weblinks.php b/administrator/components/com_weblinks/models/weblinks.php
index 580a360361763..8cfe9dbca1504 100644
--- a/administrator/components/com_weblinks/models/weblinks.php
+++ b/administrator/components/com_weblinks/models/weblinks.php
@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of weblink records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.6
+ * @since  1.6
  */
 class WeblinksModelWeblinks extends JModelList
 {
diff --git a/administrator/components/com_weblinks/tables/weblink.php b/administrator/components/com_weblinks/tables/weblink.php
index e04fbacdd2216..10d0b47bd2beb 100644
--- a/administrator/components/com_weblinks/tables/weblink.php
+++ b/administrator/components/com_weblinks/tables/weblink.php
@@ -12,9 +12,7 @@
 /**
  * Weblink Table class
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.5
+ * @since  1.5
  */
 class WeblinksTableWeblink extends JTable
 {
diff --git a/administrator/components/com_weblinks/views/weblink/view.html.php b/administrator/components/com_weblinks/views/weblink/view.html.php
index 152243d4c5d70..526176d6afe4e 100644
--- a/administrator/components/com_weblinks/views/weblink/view.html.php
+++ b/administrator/components/com_weblinks/views/weblink/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View to edit a weblink.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.5
+ * @since  1.5
  */
 class WeblinksViewWeblink extends JViewLegacy
 {
diff --git a/administrator/components/com_weblinks/views/weblinks/view.html.php b/administrator/components/com_weblinks/views/weblinks/view.html.php
index 45abc8633999c..5fc0890ddd351 100644
--- a/administrator/components/com_weblinks/views/weblinks/view.html.php
+++ b/administrator/components/com_weblinks/views/weblinks/view.html.php
@@ -12,9 +12,7 @@
 /**
  * View class for a list of weblinks.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- * @since       1.5
+ * @since  1.5
  */
 class WeblinksViewWeblinks extends JViewLegacy
 {
diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
index 5f8d5628e16b9..c7e399f2f31fd 100644
--- a/administrator/language/en-GB/en-GB.com_installer.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -124,9 +124,9 @@ COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC="The PHP temporary directory is t
 COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE="The PHP temporary directory is not writeable"
 COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC="The PHP temporary directory is not writeable by the Joomla! instance, which may cause issues when attempting to upload extensions to Joomla!. If you are having issues uploading extensions, check the '%s' and set it to be writeable and see if this fixes the issue."
 COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size"
-COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and extensions. This value is less than 2MB which may impact on uploading large extensions. This is set in the php.ini under post_max_size"
-COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Small PHP file upload size"
-COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 2MB which may impact on uploading large extensions."
+COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and extensions. This value is less than 8MB which may impact on uploading large extensions. This is set in the php.ini under post_max_size"
+COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small: This is set in php.ini in both upload_max_filesize and post_max_size settings of your PHP settings (located in php.ini and/or .htaccess file)"
+COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large extensions."
 COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation."
 COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST="PHP Upload Size bigger than POST size"
 COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC="The value of the upload_max_filesize in the php.ini file is greater than the post_max_size variable. The post_max_size variable will take precedence here and block requests larger than it. This is generally a server misconfiguration when trying to increase upload sizes. Please increase the upload_max_filesize to at least match the post_max_size variable or vice versa"
diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
index 8bf2e2abd9fa3..0b0056f77fa9e 100644
--- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -33,6 +33,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME="FTP host"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD="FTP password"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT="FTP port"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME="FTP username"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL="Additional Information"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installed Joomla! version"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Install the update"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST="Latest Joomla! version"
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index b11cf921d7f33..11b6504cc0de2 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -82,9 +82,9 @@ COM_TEMPLATES_ERROR_STYLE_REQUIRES_TITLE="The style requires a title"
 COM_TEMPLATES_ERROR_TEMPLATE_FOLDER_NOT_FOUND="Template folder not found"
 COM_TEMPLATES_ERROR_UPLOAD_INPUT="No file was found"
 COM_TEMPLATES_ERROR_WARNFILENAME="Invalid file name. Please correct the name of the file and upload again."
-COM_TEMPLATES_ERROR_WARNFILETOOLARGE="File bigger than 2 MB can not be uploaded."
+COM_TEMPLATES_ERROR_WARNFILETOOLARGE="File bigger than 2 MB can't be uploaded."
 COM_TEMPLATES_ERROR_WARNFILETYPE="File format not supported"
-COM_TEMPLATES_ERROR_WARNIEXSS="Can not be uploaded. Contains XSS."
+COM_TEMPLATES_ERROR_WARNIEXSS="Can't be uploaded. Contains XSS."
 COM_TEMPLATES_FIELD_CLIENT_DESC="Whether this template is used for the frontend (0) or the backend (1)"
 COM_TEMPLATES_FIELD_CLIENT_LABEL="Location"
 COM_TEMPLATES_FIELD_HOME_ADMINISTRATOR_DESC="This template style is defined or not as default template style"
@@ -139,7 +139,7 @@ COM_TEMPLATES_FTP_TITLE="FTP Login Details"
 COM_TEMPLATES_GRID_UNSET_LANGUAGE="Unset %s Default"
 COM_TEMPLATES_HOME_BUTTON="Documentation"
 COM_TEMPLATES_HOME_HEADING="Select a File"
-COM_TEMPLATES_HOME_TEXT="You can select from a number of options for customizing the look of your templates. The Template Manager supports Source files, Image files, Font files, Zip archives and most of the operations that can be performed on those files. Just select a file and you are good to go. Check the documentation if you want to know more."
+COM_TEMPLATES_HOME_TEXT="You can select from a number of options for customising the look of your templates. The Template Manager supports Source files, Image files, Font files, Zip archives and most of the operations that can be performed on those files. Just select a file and you are good to go. Check the documentation if you want to know more."
 COM_TEMPLATES_HEADING_ASSIGNED="Assigned"
 COM_TEMPLATES_HEADING_DEFAULT="Default"
 COM_TEMPLATES_HEADING_STYLE="Style"
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 70c05b89607ff..db6b6eefb4166 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -266,7 +266,7 @@ JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
 JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
 JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
 JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore directory %s. Please check the effective permissions."
-JGLOBAL_AUTH_PASS_BLANK="LDAP can not have blank password"
+JGLOBAL_AUTH_PASS_BLANK="LDAP can't have blank password"
 JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
 JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted"
 JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user"
@@ -815,6 +815,8 @@ JSEARCH_FILTER_LABEL="Filter:"
 JSEARCH_FILTER_CLEAR="Clear"
 JSEARCH_FILTER_SUBMIT="Search"
 JSEARCH_FILTER="Search"
+JSEARCH_HIDE_SIDEBAR="Hide the sidebar"
+JSEARCH_SHOW_SIDEBAR="Show the sidebar"
 JSEARCH_TITLE="Search %s"
 JSEARCH_RESET="Reset"
 
@@ -928,7 +930,7 @@ THOUSANDS_SEPARATOR=","
 PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient email address."
 PHPMAILER_MAILER_IS_NOT_SUPPORTED="Mailer is not supported."
 PHPMAILER_EXECUTE="Could not execute: "
-PHPMAILER_INSTANTIATE="Could not instantiate mail function."
+PHPMAILER_INSTANTIATE="Could not start mail function."
 PHPMAILER_AUTHENTICATE="SMTP Error! Could not authenticate."
 PHPMAILER_FROM_FAILED="The following from address failed: "
 PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 4dc5ba098f523..f158f0ef3f83e 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -263,7 +263,7 @@ JLIB_FILESYSTEM_ERROR_FOLDER_OPEN="Unable to open source folder"
 JLIB_FILESYSTEM_ERROR_FOLDER_LOOP="Infinite loop detected"
 JLIB_FILESYSTEM_ERROR_FOLDER_PATH="Path not in open_basedir paths"
 JLIB_FILESYSTEM_ERROR_COULD_NOT_CREATE_DIRECTORY="Could not create directory"
-JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY="You can not delete a base directory."
+JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY="You can't delete a base directory."
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :delete: Path is not a folder. Path: %s"
 JLIB_FILESYSTEM_ERROR_FOLDER_DELETE="JFolder: :delete: Could not delete folder. Path: %s"
 JLIB_FILESYSTEM_ERROR_FOLDER_RENAME="Rename failed: %s"
@@ -640,7 +640,7 @@ JLIB_USER_ERROR_PASSWORD_NOT_MATCH="Passwords do not match. Please re-enter pass
 JLIB_USER_ERROR_UNABLE_TO_FIND_USER="Unable to find a user with given activation string"
 JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="JUser: :_load: Unable to load user with ID: %s"
 JLIB_USER_EXCEPTION_ACCESS_USERGROUP_INVALID="User Group does not exist"
-JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Instantiation Error"
+JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Startup Error"
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database <br />joomla.library: %1$s - %2$s"
 JLIB_UTIL_ERROR_DOMIT="DommitDocument is deprecated. Use DomDocument instead"
 JLIB_UTIL_ERROR_LOADING_FEED_DATA="Error loading feed data"
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 9f5a9363500d3..efb81fbece431 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.3.4-dev</version>
-	<creationDate>July 2014</creationDate>
+	<version>3.3.7-dev</version>
+	<creationDate>September 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/modules/mod_quickicon/helper.php b/administrator/modules/mod_quickicon/helper.php
index c4aa9933f17f8..822391aa89bf7 100644
--- a/administrator/modules/mod_quickicon/helper.php
+++ b/administrator/modules/mod_quickicon/helper.php
@@ -192,6 +192,7 @@ public static function groupButtons($buttons)
 		{
 			$groupedButtons[$button['group']][] = $button;
 		}
+
 		return $groupedButtons;
 	}
 
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index cfbbe1c2b3bb8..1e03b879b8a1e 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -7016,12 +7016,13 @@ body {
 	box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
 }
 .view-login .login-joomla {
-	display: inline-block;
+	position: absolute;
+	left: 50%;
 	height: 24px;
 	width: 24px;
 	text-indent: -9999px;
 	background: url('../images/login-joomla.png') no-repeat;
-	margin-left: -20px;
+	margin-left: -12px;
 }
 .view-login .navbar-fixed-bottom {
 	position: absolute;
@@ -7967,6 +7968,62 @@ a.grid_true {
 	width: 16px;
 	background-image: url('../images/admin/icon-16-allow.png');
 }
+#j-sidebar-container {
+	margin-right: 10px;
+}
+div#j-sidebar-container.j-toggle-hidden {
+	width: 0;
+	margin-right: 0;
+}
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button {
+	position: absolute;
+	color: #111;
+	padding: 6px 4px 0 6px;
+	border-radius: 0 4px 4px 0;
+}
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button {
+	position: relative;
+	color: #999;
+	padding: 2px 5px;
+	border-radius: 4px 4px 0 0;
+	text-align: right;
+	border-bottom: 1px solid #d3d3d3;
+}
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button:hover {
+	color: #555;
+	background: #e6e6e6;
+}
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button:hover {
+	color: #555;
+	background: #e6e6e6;
+}
+#j-toggle-sidebar-button {
+	left: 0;
+	border-left: 0;
+	background: #e1e1e1;
+	margin-top: 0;
+	cursor: pointer;
+	height: 23px;
+}
+#sidebar {
+	padding: 3px;
+	background: #ffffff;
+	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
+	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
+	border-right: 1px solid #e1e1e1;
+	border-left: 1px solid #e1e1e1;
+	border-bottom: 1px solid #e1e1e1;
+	border-radius: 0 0 4px 4px;
+}
+.j-toggle-visible #j-toggle-sidebar-icon {
+	margin-top: 6px;
+	margin-left: 4px;
+}
 .pull-right {
 	float: left;
 }
@@ -8530,6 +8587,15 @@ input[type="url"] {
 	text-align: left;
 	direction: ltr;
 }
+#aside .nav .nav-child {
+	border-left: 0;
+	border-right: 2px solid #ddd;
+	padding-left: 0;
+	padding-right: 5px;
+}
+.dropdown-menu {
+	text-align: right;
+}
 .navbar .admin-logo {
 	float: right;
 	padding: 7px 15px 0px 12px;
@@ -8598,3 +8664,34 @@ a.grid_true {
 	width: 16px;
 	background-image: url('../images/admin/icon-16-allow.png');
 }
+.view-login .login-joomla {
+	position: absolute;
+	right: 50%;
+	height: 24px;
+	width: 24px;
+	text-indent: -9999px;
+	background: url('../images/login-joomla.png') no-repeat;
+	margin-right: -12px;
+}
+#j-sidebar-container {
+	margin-left: 10px;
+	margin-right: 0;
+}
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button {
+	padding: 6px 2px 0 4px;
+	border-radius: 4px 0 0 4px;
+}
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button {
+	text-align: left;
+}
+#j-toggle-sidebar-button {
+	right: 0;
+	left: auto;
+	border-right: 0;
+}
+.j-toggle-visible #j-toggle-sidebar-icon {
+	margin-right: 4px;
+}
+#j-main-container.expanded {
+	margin-right: 0;
+}
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 15a491016e2ad..ceb73a908c3b8 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -7016,12 +7016,13 @@ body {
 	box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
 }
 .view-login .login-joomla {
-	display: inline-block;
+	position: absolute;
+	left: 50%;
 	height: 24px;
 	width: 24px;
 	text-indent: -9999px;
 	background: url('../images/login-joomla.png') no-repeat;
-	margin-left: -20px;
+	margin-left: -12px;
 }
 .view-login .navbar-fixed-bottom {
 	position: absolute;
@@ -7967,3 +7968,59 @@ a.grid_true {
 	width: 16px;
 	background-image: url('../images/admin/icon-16-allow.png');
 }
+#j-sidebar-container {
+	margin-right: 10px;
+}
+div#j-sidebar-container.j-toggle-hidden {
+	width: 0;
+	margin-right: 0;
+}
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button {
+	position: absolute;
+	color: #111;
+	padding: 6px 4px 0 6px;
+	border-radius: 0 4px 4px 0;
+}
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button {
+	position: relative;
+	color: #999;
+	padding: 2px 5px;
+	border-radius: 4px 4px 0 0;
+	text-align: right;
+	border-bottom: 1px solid #d3d3d3;
+}
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button:hover {
+	color: #555;
+	background: #e6e6e6;
+}
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button:hover {
+	color: #555;
+	background: #e6e6e6;
+}
+#j-toggle-sidebar-button {
+	left: 0;
+	border-left: 0;
+	background: #e1e1e1;
+	margin-top: 0;
+	cursor: pointer;
+	height: 23px;
+}
+#sidebar {
+	padding: 3px;
+	background: #ffffff;
+	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
+	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
+	border-right: 1px solid #e1e1e1;
+	border-left: 1px solid #e1e1e1;
+	border-bottom: 1px solid #e1e1e1;
+	border-radius: 0 0 4px 4px;
+}
+.j-toggle-visible #j-toggle-sidebar-icon {
+	margin-top: 6px;
+	margin-left: 4px;
+}
diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less
index a619f3c722a2b..dc6a32f6c609f 100644
--- a/administrator/templates/isis/less/template-rtl.less
+++ b/administrator/templates/isis/less/template-rtl.less
@@ -82,3 +82,43 @@ a.grid_true {
 	width: 16px;
 	background-image: url('../images/admin/icon-16-allow.png');
 }
+
+/* Login */
+.view-login .login-joomla {
+	position: absolute;
+	right: 50%;
+	height: 24px;
+	width: 24px;
+	text-indent: -9999px;
+	background: url('../images/login-joomla.png') no-repeat;
+	margin-right: -12px;
+}
+
+/* For collapsible sidebar */
+#j-sidebar-container {
+	margin-left: 10px;
+	margin-right: 0;
+}
+
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button {
+	padding: 6px 2px 0 4px;
+	border-radius: 4px 0 0 4px;
+}
+
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button {
+	text-align: left;
+}
+
+#j-toggle-sidebar-button {
+	right: 0;
+	left: auto;
+	border-right: 0;
+}
+
+.j-toggle-visible #j-toggle-sidebar-icon {
+	margin-right: 4px;
+}
+
+#j-main-container.expanded {
+	margin-right: 0;
+}
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index cb8e6cd3c5c87..90fb829eff2d2 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -120,12 +120,13 @@ body {
 		.box-shadow(~"0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset");
 	}
 	.login-joomla{
-		display: inline-block;
+		position: absolute;
+		left: 50%;
 		height: 24px;
 		width: 24px;
 		text-indent: -9999px;
 		background: url('../images/login-joomla.png') no-repeat;
-		margin-left: -20px;
+		margin-left: -12px;
 	}
 	.navbar-fixed-bottom{
 		position: absolute;
@@ -1039,3 +1040,69 @@ a.grid_true {
 	width: 16px;
 	background-image: url('../images/admin/icon-16-allow.png');
 }
+
+/* For collapsible sidebar */
+#j-sidebar-container {
+	margin-right: 10px;
+}
+
+div#j-sidebar-container.j-toggle-hidden {
+	width: 0;
+	margin-right: 0;
+}
+
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button {
+	position: absolute;
+	color: #111;
+	padding: 6px 4px 0 6px;
+	border-radius: 0 4px 4px 0;
+}
+
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button {
+	position: relative;
+	color: #999;
+	padding: 2px 5px;
+	border-radius: 4px 4px 0 0;
+	text-align: right;
+	border-bottom: 1px solid #d3d3d3;
+}
+
+div#j-sidebar-container.j-toggle-hidden #j-toggle-sidebar-button:hover {
+  color: #555;
+  background: #e6e6e6;
+}
+
+div#j-sidebar-container.j-toggle-visible #j-toggle-sidebar-button:hover {
+  color: #555;
+  background: #e6e6e6;
+}
+
+#j-toggle-sidebar-button {
+	left: 0;
+	border-left: 0;
+	background: #e1e1e1;
+	margin-top: 0;
+	cursor: pointer;
+	height: 23px;
+}
+
+#sidebar {
+	padding: 3px;
+	background: #ffffff;
+	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
+	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
+	border-right: 1px solid #e1e1e1;
+	border-left: 1px solid #e1e1e1;
+	border-bottom: 1px solid #e1e1e1;
+	border-radius: 0 0 4px 4px;
+}
+
+.j-toggle-visible #j-toggle-sidebar-icon {
+	margin-top: 6px;
+	margin-left: 4px;
+}
diff --git a/bin/keychain.php b/bin/keychain.php
index 5a8348e41665f..e0f862f04094d 100644
--- a/bin/keychain.php
+++ b/bin/keychain.php
@@ -94,6 +94,7 @@ public function execute( )
 		{
 			$this->saveKeychain();
 		}
+
 		exit(0);
 	}
 
@@ -203,6 +204,7 @@ protected function create()
 			$this->out('error: entry already exists. To change this entry, use "change"');
 			exit(1);
 		}
+
 		$this->change();
 	}
 
@@ -220,6 +222,7 @@ protected function change()
 			$this->out("usage: {$this->input->executable} [options] change entry_name entry_value");
 			exit(1);
 		}
+
 		$this->updated = true;
 		$this->keychain->setValue($this->input->args[1], $this->input->args[2]);
 	}
@@ -298,6 +301,7 @@ protected function listEntries()
 			{
 				$line .= ': ' . $this->dumpVar($value);
 			}
+
 			$this->out($line);
 		}
 	}
diff --git a/build.xml b/build.xml
index d85bb2efb799f..ad0d33e2b0289 100644
--- a/build.xml
+++ b/build.xml
@@ -75,7 +75,7 @@
 			<arg value="--template" />
 			<arg value="joomla" />
 			<arg value="--title" />
-			<arg value="Joomla! CMS API" />
+			<arg value="Joomla! CMS 3.3 API" />
 		</exec>
 	</target>
 
@@ -130,6 +130,21 @@
 		</apply>
 	</target>
 
+	<target name="make-updatecomponent" description="Create an installable package from the com_joomlaupdate component" >
+		<delete dir="${basedir}/build/com_joomlaupdate-pkg" includeemptydirs="true" failonerror="false" />
+		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg" />
+		<echo message="Create com_joomlaupdate package" />
+		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/staging" />
+		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/staging/admin" />
+		<copy todir="${basedir}/build/com_joomlaupdate-pkg/staging/admin">
+			<fileset dir="${basedir}/administrator/components/com_joomlaupdate" />
+		</copy>
+		<move file="${basedir}/build/com_joomlaupdate-pkg/staging/admin/joomlaupdate.xml" todir="${basedir}/build/com_joomlaupdate-pkg/staging" />
+
+		<echo message="Archiving package" />
+		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/packages" />
+		<zip destfile="${basedir}/build/com_joomlaupdate-pkg/packages/com_joomlaupdate.zip" basedir="${basedir}/build/com_joomlaupdate-pkg/staging" />
+	</target>
 
 	<target name="build" depends="clean,phpunit,parallelTasks" />
 </project>
diff --git a/build/.gitignore b/build/.gitignore
index 79eabdf894a09..f9970ebc8abd3 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -6,3 +6,4 @@
 
 # Ignore the folder the build script creates for packages
 /tmp
+/com_joomlaupdate-pkg
diff --git a/build/phpcs/Joomla/Sniffs/Commenting/ClassCommentSniff.php b/build/phpcs/Joomla/Sniffs/Commenting/ClassCommentSniff.php
index bcd0eeef04c9b..4346f0e3aa8d7 100644
--- a/build/phpcs/Joomla/Sniffs/Commenting/ClassCommentSniff.php
+++ b/build/phpcs/Joomla/Sniffs/Commenting/ClassCommentSniff.php
@@ -70,7 +70,7 @@ class Joomla_Sniffs_Commenting_ClassCommentSniff extends Joomla_Sniffs_Commentin
                                         'order_text'     => 'must follow @version (if used)',
                                        ),
                        'package'    => array(
-                                        'required'       => true,
+                                        'required'       => false,
                                         'allow_multiple' => false,
                                         'order_text'     => 'must follow @category (if used)',
                                        ),
diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
index 804f7e7485d6d..61208c1627970 100644
--- a/build/phpcs/Joomla/ruleset.xml
+++ b/build/phpcs/Joomla/ruleset.xml
@@ -83,7 +83,6 @@
   <exclude name="Squiz.Operators.IncrementDecrementUsage.processAssignment"/>
   <!-- These exceptions are temporary -->
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
  </rule>
 
  <rule ref="Squiz.Scope.StaticThisUsage"/>
@@ -92,8 +91,6 @@
  <!-- These exceptions are temporary -->
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
   <exclude-pattern type="relative">templates/*</exclude-pattern>
   <exclude-pattern type="relative">layouts/*</exclude-pattern>
   <exclude-pattern type="relative">*/tmpl/*</exclude-pattern>
@@ -126,7 +123,6 @@
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">administrator/includes/framework.php</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
  </rule>
 
  <rule ref="Joomla.Commenting.FunctionComment">
@@ -134,8 +130,6 @@
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">administrator/includes/framework.php</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
   <exclude-pattern type="relative">templates/*</exclude-pattern>
   <exclude-pattern type="relative">layouts/*</exclude-pattern>
   <exclude-pattern type="relative">includes/*</exclude-pattern>
@@ -146,8 +140,6 @@
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">administrator/includes/framework.php</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
   <exclude-pattern type="relative">templates/*</exclude-pattern>
   <exclude-pattern type="relative">layouts/*</exclude-pattern>
   <exclude-pattern type="relative">includes/*</exclude-pattern>
@@ -157,7 +149,6 @@
   <!-- We exclude components and modules for now -->
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
  </rule>
 
  <rule ref="Joomla.WhiteSpace.ConcatenationSpacing">
@@ -165,8 +156,6 @@
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">administrator/includes/framework.php</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
   <exclude-pattern type="relative">templates/*</exclude-pattern>
   <exclude-pattern type="relative">layouts/*</exclude-pattern>
   <exclude-pattern type="relative">includes/*</exclude-pattern>
@@ -177,8 +166,6 @@
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">administrator/includes/framework.php</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
   <exclude-pattern type="relative">includes/*</exclude-pattern>
   <!-- These exceptions are permanent -->
   <exclude-pattern type="relative">*/tmpl/*</exclude-pattern>
@@ -203,8 +190,6 @@
   <exclude-pattern type="relative">administrator/components/*</exclude-pattern>
   <exclude-pattern type="relative">administrator/includes/framework.php</exclude-pattern>
   <exclude-pattern type="relative">components/*</exclude-pattern>
-  <exclude-pattern type="relative">plugins/*</exclude-pattern>
-  <exclude-pattern type="relative">modules/*</exclude-pattern>
   <!-- These exceptions are permanent -->
   <exclude-pattern type="relative">*/tmpl/*</exclude-pattern>
   <exclude-pattern type="relative">templates/*</exclude-pattern>
diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index 9c4608735ea08..5a32d79329369 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -70,6 +70,7 @@ protected function getListQuery()
 				'a.name as name,' .
 				'a.clickurl as clickurl,' .
 				'a.cid as cid,' .
+				'a.description as description,' .
 				'a.params as params,' .
 				'a.custombannercode as custombannercode,' .
 				'a.track_impressions as track_impressions,' .
@@ -145,7 +146,14 @@ protected function getListQuery()
 				foreach ($keywords as $keyword)
 				{
 					$keyword = trim($keyword);
-					$condition1 = "a.own_prefix=1 AND a.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH( a.metakey_prefix)) OR a.own_prefix=0 AND cl.own_prefix=1 AND cl.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH(cl.metakey_prefix)) OR a.own_prefix=0 AND cl.own_prefix=0 AND " . ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0');
+					$condition1 = "a.own_prefix=1 "
+						. " AND a.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH( a.metakey_prefix)) "
+						. " OR a.own_prefix=0 "
+						. " AND cl.own_prefix=1 "
+						. " AND cl.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH(cl.metakey_prefix)) "
+						. " OR a.own_prefix=0 "
+						. " AND cl.own_prefix=0 "
+						. " AND " . ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0');
 
 					$condition2 = "a.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
 
diff --git a/components/com_banners/router.php b/components/com_banners/router.php
index 2a9e578278396..3079b74661436 100644
--- a/components/com_banners/router.php
+++ b/components/com_banners/router.php
@@ -117,7 +117,7 @@ public function parse(&$segments)
  * @since   3.3
  * @deprecated  4.0  Use Class based routers instead
  */
-function BannersBuildRoute(&$query)
+function bannersBuildRoute(&$query)
 {
 	$router = new BannersRouter;
 
@@ -137,7 +137,7 @@ function BannersBuildRoute(&$query)
  * @since   3.3
  * @deprecated  4.0  Use Class based routers instead
  */
-function BannersParseRoute($segments)
+function bannersParseRoute($segments)
 {
 	$router = new BannersRouter;
 
diff --git a/components/com_config/controller/cmsbase.php b/components/com_config/controller/cmsbase.php
index 60acd49d77585..7a361d152c45a 100644
--- a/components/com_config/controller/cmsbase.php
+++ b/components/com_config/controller/cmsbase.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerCmsbase extends JControllerBase
 {
 	/**
diff --git a/components/com_config/controller/config/display.php b/components/com_config/controller/config/display.php
index 4d43c5ab696a6..fc98d19d60ad0 100644
--- a/components/com_config/controller/config/display.php
+++ b/components/com_config/controller/config/display.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerConfigDisplay extends ConfigControllerDisplay
 {
 	/**
diff --git a/components/com_config/controller/config/save.php b/components/com_config/controller/config/save.php
index d79c8952ed869..b80f87b45247b 100644
--- a/components/com_config/controller/config/save.php
+++ b/components/com_config/controller/config/save.php
@@ -14,7 +14,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerConfigSave extends JControllerBase
 {
 	/**
diff --git a/components/com_config/controller/display.php b/components/com_config/controller/display.php
index 604e766ab7e4a..6c7d3497f0b0d 100644
--- a/components/com_config/controller/display.php
+++ b/components/com_config/controller/display.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerDisplay extends JControllerBase
 {
 	/**
diff --git a/components/com_config/controller/helper.php b/components/com_config/controller/helper.php
index 09eb972dfe02a..a323582d7c0eb 100644
--- a/components/com_config/controller/helper.php
+++ b/components/com_config/controller/helper.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerHelper
 {
 	/**
diff --git a/components/com_config/controller/templates/display.php b/components/com_config/controller/templates/display.php
index ee13ab38a8da2..bb65d8ce4a1be 100644
--- a/components/com_config/controller/templates/display.php
+++ b/components/com_config/controller/templates/display.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerTemplatesDisplay extends ConfigControllerDisplay
 {
 	/**
diff --git a/components/com_config/controller/templates/save.php b/components/com_config/controller/templates/save.php
index 14608a6d370f1..43517a9da2767 100644
--- a/components/com_config/controller/templates/save.php
+++ b/components/com_config/controller/templates/save.php
@@ -14,7 +14,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerTemplatesSave extends JControllerBase
 {
 	/**
diff --git a/components/com_config/model/form.php b/components/com_config/model/form.php
index d1403466a4186..fc4280185b82a 100644
--- a/components/com_config/model/form.php
+++ b/components/com_config/model/form.php
@@ -188,7 +188,6 @@ protected function loadForm($name, $source = null, $options = array(), $clear =
 
 			// Load the data into the form after the plugins have operated.
 			$form->bind($data);
-
 		}
 		catch (Exception $e)
 		{
diff --git a/components/com_config/view/cms/html.php b/components/com_config/view/cms/html.php
index ce7b9bf7e3c39..0ea7fe2a8e543 100644
--- a/components/com_config/view/cms/html.php
+++ b/components/com_config/view/cms/html.php
@@ -102,12 +102,6 @@ public function loadTemplate($tpl = null)
 		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
 		|| $lang->load('tpl_' . $template, JPATH_THEMES . "/$template", null, false, true);
 
-		// Change the template folder if alternative layout is in different template
-		/* if (isset($layoutTemplate) && $layoutTemplate != '_' && $layoutTemplate != $template)
-		{
-			$this->_path['template'] = str_replace($template, $layoutTemplate, $this->_path['template']);
-		} */
-
 		// Prevents adding path twise
 		if (empty($this->_path['template']))
 		{
diff --git a/components/com_contact/controller.php b/components/com_contact/controller.php
index 35ad619b893f6..da5593245ef63 100644
--- a/components/com_contact/controller.php
+++ b/components/com_contact/controller.php
@@ -21,13 +21,14 @@ class ContactController extends JControllerLegacy
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  This object to support chaining.
 	 *
-	 * @return  JController		This object to support chaining.
 	 * @since   1.5
 	 */
-	public function display($cachable = false, $urlparams = false)
+	public function display($cachable = false, $urlparams = array())
 	{
 		$cachable = true;
 
@@ -35,8 +36,10 @@ public function display($cachable = false, $urlparams = false)
 		$vName = $this->input->get('view', 'categories');
 		$this->input->set('view', $vName);
 
-		$safeurlparams = array('catid' => 'INT', 'id' => 'INT', 'cid' => 'ARRAY', 'year' => 'INT', 'month' => 'INT', 'limit' => 'UINT', 'limitstart' => 'UINT',
-			'showall' => 'INT', 'return' => 'BASE64', 'filter' => 'STRING', 'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'filter-search' => 'STRING', 'print' => 'BOOLEAN', 'lang' => 'CMD');
+		$safeurlparams = array('catid' => 'INT', 'id' => 'INT', 'cid' => 'ARRAY', 'year' => 'INT', 'month' => 'INT',
+			'limit' => 'UINT', 'limitstart' => 'UINT', 'showall' => 'INT', 'return' => 'BASE64', 'filter' => 'STRING',
+			'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'filter-search' => 'STRING', 'print' => 'BOOLEAN',
+			'lang' => 'CMD');
 
 		parent::display($cachable, $safeurlparams);
 
diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php
index 61d81bd14fd41..057a24dde777d 100644
--- a/components/com_contact/controllers/contact.php
+++ b/components/com_contact/controllers/contact.php
@@ -10,16 +10,37 @@
 defined('_JEXEC') or die;
 
 /**
+ * Controller for single contact view
+ *
  * @package     Joomla.Site
  * @subpackage  com_contact
+ * @since       1.5.19
  */
 class ContactControllerContact extends JControllerForm
 {
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6.4
+	 */
 	public function getModel($name = '', $prefix = '', $config = array('ignore_request' => true))
 	{
 		return parent::getModel($name, $prefix, array('ignore_request' => false));
 	}
 
+	/**
+	 * Method to submit the contact form and send an email.
+	 *
+	 * @return  boolean  True on success sending the email. False on failure.
+	 *
+	 * @since   1.5.19
+	 */
 	public function submit()
 	{
 		// Check for request forgeries.
@@ -145,6 +166,17 @@ public function submit()
 		return true;
 	}
 
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   array      $data                  The data to send in the email.
+	 * @param   stdClass   $contact               The user information to send the email to
+	 * @param   boolean    $copy_email_activated  True to send a copy of the email to the user.
+	 *
+	 * @return  boolean  True on success sending the email, false on failure.
+	 *
+	 * @since   1.6.4
+	 */
 	private function _sendEmail($data, $contact, $copy_email_activated)
 	{
 			$app = JFactory::getApplication();
diff --git a/components/com_contact/helpers/category.php b/components/com_contact/helpers/category.php
index e814bcabe846a..3757f8b525e16 100644
--- a/components/com_contact/helpers/category.php
+++ b/components/com_contact/helpers/category.php
@@ -18,6 +18,13 @@
  */
 class ContactCategories extends JCategories
 {
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($options = array())
 	{
 		$options['table'] = '#__contact_details';
diff --git a/components/com_contact/helpers/icon.php b/components/com_contact/helpers/icon.php
index fb35ec6917c6e..8be3e25f8ee10 100644
--- a/components/com_contact/helpers/icon.php
+++ b/components/com_contact/helpers/icon.php
@@ -25,7 +25,7 @@ public static function email($contact, $params, $attribs = array())
 		$uri	= JUri::getInstance();
 		$base	= $uri->toString(array('scheme', 'host', 'port'));
 		$link	= $base . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid), false);
-		$url	= 'index.php?option=com_mailto&tmpl=component&link='.MailToHelper::addLink($link);
+		$url	= 'index.php?option=com_mailto&tmpl=component&link=' . MailToHelper::addLink($link);
 
 		$status = 'width=400,height=350,menubar=yes,resizable=yes';
 
@@ -35,51 +35,53 @@ public static function email($contact, $params, $attribs = array())
 		}
 		else
 		{
-			$text = '&#160;'.JText::_('JGLOBAL_EMAIL');
+			$text = '&#160;' . JText::_('JGLOBAL_EMAIL');
 		}
 
 		$attribs['title']	= JText::_('JGLOBAL_EMAIL');
-		$attribs['onclick'] = "window.open(this.href,'win2','".$status."'); return false;";
+		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
 
 		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
+
 		return $output;
 	}
 
 	public static function print_popup($article, $params, $attribs = array())
 	{
 		$url  = ContentHelperRoute::getContactRoute($contact->slug, $contact->catid);
-		$url .= '&tmpl=component&print=1&layout=default&page='.@ $request->limitstart;
+		$url .= '&tmpl=component&print=1&layout=default&page=' . @ $request->limitstart;
 
 		$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
 
-		// checks template image directory for image, if non found default are loaded
+		// Checks template image directory for image, if non found default are loaded
 		if ($params->get('show_icons'))
 		{
 			$text = JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true);
 		}
 		else
 		{
-			$text = JText::_('JGLOBAL_ICON_SEP') .'&#160;'. JText::_('JGLOBAL_PRINT') .'&#160;'. JText::_('JGLOBAL_ICON_SEP');
+			$text = JText::_('JGLOBAL_ICON_SEP') . '&#160;' . JText::_('JGLOBAL_PRINT') . '&#160;' . JText::_('JGLOBAL_ICON_SEP');
 		}
 
-		$attribs['title']	= JText::_('JGLOBAL_PRINT');
-		$attribs['onclick'] = "window.open(this.href,'win2','".$status."'); return false;";
-		$attribs['rel']		= 'nofollow';
+		$attribs['title']   = JText::_('JGLOBAL_PRINT');
+		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
+		$attribs['rel']	    = 'nofollow';
 
 		return JHtml::_('link', JRoute::_($url), $text, $attribs);
 	}
 
 	public static function print_screen($contact, $params, $attribs = array())
 	{
-		// checks template image directory for image, if non found default are loaded
+		// Checks template image directory for image, if non found default are loaded
 		if ($params->get('show_icons'))
 		{
 			$text = JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true);
 		}
 		else
 		{
-			$text = JText::_('JGLOBAL_ICON_SEP') .'&#160;'. JText::_('JGLOBAL_PRINT') .'&#160;'. JText::_('JGLOBAL_ICON_SEP');
+			$text = JText::_('JGLOBAL_ICON_SEP') .'&#160;' . JText::_('JGLOBAL_PRINT') . '&#160;' . JText::_('JGLOBAL_ICON_SEP');
 		}
-		return '<a href="#" onclick="window.print();return false;">'.$text.'</a>';
+
+		return '<a href="#" onclick="window.print();return false;">' . $text . '</a>';
 	}
 }
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 1023c46357380..b6be28e517484 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -24,7 +24,15 @@ abstract class ContactHelperRoute
 	protected static $lang_lookup = array();
 
 	/**
-	 * @param   integer  The route of the contact
+	 * Get the URL route for a contact from a contact ID, contact category ID and language
+	 *
+	 * @param   integer  $id        The id of the contact
+	 * @param   integer  $catid     The id of the contact's category
+	 * @param   mixed    $language  The id of the language being used.
+	 *
+	 * @return  string  The link to the contact
+	 *
+	 * @since   1.5
 	 */
 	public static function getContactRoute($id, $catid, $language = 0)
 	{
@@ -66,6 +74,16 @@ public static function getContactRoute($id, $catid, $language = 0)
 		return $link;
 	}
 
+	/**
+	 * Get the URL route for a contact category from a contact category ID and language
+	 *
+	 * @param   mixed    $catid     The id of the contact's category either an integer id or a instance of JCategoryNode
+	 * @param   mixed    $language  The id of the language being used.
+	 *
+	 * @return  string  The link to the contact
+	 *
+	 * @since   1.5
+	 */
 	public static function getCategoryRoute($catid, $language = 0)
 	{
 		if ($catid instanceof JCategoryNode)
diff --git a/components/com_contact/models/categories.php b/components/com_contact/models/categories.php
index c894e48bb91dd..5de82c2ece9b3 100644
--- a/components/com_contact/models/categories.php
+++ b/components/com_contact/models/categories.php
@@ -41,6 +41,11 @@ class ContactModelCategories extends JModelList
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -66,25 +71,25 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id	A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
 	 */
 	protected function getStoreId($id = '')
 	{
 		// Compile the store id.
-		$id	.= ':'.$this->getState('filter.extension');
-		$id	.= ':'.$this->getState('filter.published');
-		$id	.= ':'.$this->getState('filter.access');
-		$id	.= ':'.$this->getState('filter.parentId');
+		$id	.= ':' . $this->getState('filter.extension');
+		$id	.= ':' . $this->getState('filter.published');
+		$id	.= ':' . $this->getState('filter.access');
+		$id	.= ':' . $this->getState('filter.parentId');
 
 		return parent::getStoreId($id);
 	}
 
 	/**
-	 * redefine the function an add some properties to make the styling more easy
+	 * Redefine the function an add some properties to make the styling more easy
 	 *
-	 * @return mixed An array of data items on success, false on failure.
+	 * @return  mixed  An array of data items on success, false on failure.
 	 */
 	public function getItems()
 	{
@@ -94,18 +99,23 @@ public function getItems()
 			$menu = $app->getMenu();
 			$active = $menu->getActive();
 			$params = new JRegistry;
+
 			if ($active)
 			{
 				$params->loadString($active->params);
 			}
+
 			$options = array();
 			$options['countItems'] = $params->get('show_cat_items_cat', 1) || !$params->get('show_empty_categories_cat', 0);
 			$categories = JCategories::getInstance('Contact', $options);
 			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
 			if (is_object($this->_parent))
 			{
 				$this->_items = $this->_parent->getChildren();
-			} else {
+			}
+			else
+			{
 				$this->_items = false;
 			}
 		}
@@ -113,12 +123,20 @@ public function getItems()
 		return $this->_items;
 	}
 
+	/**
+	 * Gets the id of the parent category for the selected list of categories
+	 *
+	 * @return   integer  The id of the parent category
+	 *
+	 * @since    1.6.0
+	 */
 	public function getParent()
 	{
 		if (!is_object($this->_parent))
 		{
 			$this->getItems();
 		}
+
 		return $this->_parent;
 	}
 }
diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php
index eeead1ec3ae32..7ec77e29b141e 100644
--- a/components/com_contact/models/category.php
+++ b/components/com_contact/models/category.php
@@ -10,6 +10,8 @@
 defined('_JEXEC') or die;
 
 /**
+ * Single item model for a contact
+ *
  * @package     Joomla.Site
  * @subpackage  com_contact
  * @since       1.5
@@ -40,18 +42,18 @@ class ContactModelCategory extends JModelList
 	protected $_category = null;
 
 	/**
-	 * The list of other newfeed categories.
+	 * The list of other contact categories.
 	 *
 	 * @access    protected
-	 * @var        array
+	 * @var       array
 	 */
 	protected $_categories = null;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
-	 * @see     JController
+	 * @param   array  $config  An optional associative array of configuration settings.
+
 	 * @since   1.6
 	 */
 	public function __construct($config = array())
@@ -98,7 +100,6 @@ public function getItems()
 			}
 			$this->tags = new JHelperTags;
 			$this->tags->getItemTags('com_contact.contact', $item->id);
-
 		}
 
 		return $items;
@@ -120,7 +121,7 @@ protected function getListQuery()
 		$query = $db->getQuery(true);
 
 		// Select required fields from the categories.
-		//sqlsrv changes
+		// Changes for sqlsrv
 		$case_when = ' CASE WHEN ';
 		$case_when .= $query->charLength('a.alias', '!=', '0');
 		$case_when .= ' THEN ';
@@ -218,6 +219,7 @@ protected function populateState($ordering = null, $direction = null)
 
 		// List state information
 		$format = $app->input->getWord('format');
+
 		if ($format == 'feed')
 		{
 			$limit = $app->get('feed_limit');
@@ -226,6 +228,7 @@ protected function populateState($ordering = null, $direction = null)
 		{
 			$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
 		}
+
 		$this->setState('list.limit', $limit);
 
 		$limitstart = $app->input->get('limitstart', 0, 'uint');
@@ -236,10 +239,12 @@ protected function populateState($ordering = null, $direction = null)
 
 		// Get list ordering default from the parameters
 		$menuParams = new JRegistry;
+
 		if ($menu = $app->getMenu()->getActive())
 		{
 			$menuParams->loadString($menu->params);
 		}
+
 		$mergedParams = clone $params;
 		$mergedParams->merge($menuParams);
 
@@ -251,24 +256,28 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('list.ordering', $orderCol);
 
 		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
 		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
 		{
 			$listOrder = 'ASC';
 		}
+
 		$this->setState('list.direction', $listOrder);
 
 		$id = $app->input->get('id', 0, 'int');
 		$this->setState('category.id', $id);
 
 		$user = JFactory::getUser();
+
 		if ((!$user->authorise('core.edit.state', 'com_contact')) && (!$user->authorise('core.edit', 'com_contact')))
 		{
-			// limit to published for people who can't edit or edit.state.
+			// Limit to published for people who can't edit or edit.state.
 			$this->setState('filter.published', 1);
 
 			// Filter by start and end dates.
 			$this->setState('filter.publish_date', true);
 		}
+
 		$this->setState('filter.language', JLanguageMultilang::isEnabled());
 
 		// Load the parameters.
@@ -278,9 +287,8 @@ protected function populateState($ordering = null, $direction = null)
 	/**
 	 * Method to get category data for the current category
 	 *
-	 * @param   integer  An optional ID
+	 * @return  object  The category object
 	 *
-	 * @return  object
 	 * @since   1.5
 	 */
 	public function getCategory()
@@ -305,10 +313,12 @@ public function getCategory()
 			{
 				$this->_children = $this->_item->getChildren();
 				$this->_parent = false;
+
 				if ($this->_item->getParent())
 				{
 					$this->_parent = $this->_item->getParent();
 				}
+
 				$this->_rightsibling = $this->_item->getSibling();
 				$this->_leftsibling = $this->_item->getSibling(false);
 			}
@@ -325,8 +335,6 @@ public function getCategory()
 	/**
 	 * Get the parent category.
 	 *
-	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
-	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
 	 */
 	public function getParent()
@@ -335,6 +343,7 @@ public function getParent()
 		{
 			$this->getCategory();
 		}
+
 		return $this->_parent;
 	}
 
@@ -343,37 +352,43 @@ public function getParent()
 	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
 	 */
-	function &getLeftSibling()
+	public function &getLeftSibling()
 	{
 		if (!is_object($this->_item))
 		{
 			$this->getCategory();
 		}
+
 		return $this->_leftsibling;
 	}
 
-	function &getRightSibling()
+	/**
+	 * Get the sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getRightSibling()
 	{
 		if (!is_object($this->_item))
 		{
 			$this->getCategory();
 		}
+
 		return $this->_rightsibling;
 	}
 
 	/**
 	 * Get the child categories.
 	 *
-	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
-	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
 	 */
-	function &getChildren()
+	public function &getChildren()
 	{
 		if (!is_object($this->_item))
 		{
 			$this->getCategory();
 		}
+
 		return $this->_children;
 	}
 
diff --git a/components/com_contact/models/contact.php b/components/com_contact/models/contact.php
index 07b7ac1b37f35..8c25d67a41059 100644
--- a/components/com_contact/models/contact.php
+++ b/components/com_contact/models/contact.php
@@ -17,10 +17,17 @@
 class ContactModelContact extends JModelForm
 {
 	/**
+	 * The name of the view for a single item
+	 *
 	 * @since   1.6
 	 */
 	protected $view_item = 'contact';
 
+	/**
+	 * A loaded item
+	 *
+	 * @since   1.6
+	 */
 	protected $_item = null;
 
 	/**
@@ -35,6 +42,8 @@ class ContactModelContact extends JModelForm
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState()
@@ -64,8 +73,9 @@ protected function populateState()
 	 *
 	 * @param   array    $data      An optional array of data for the form to interrogate.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
-	 * 
+	 *
 	 * @return  JForm  A JForm object on success, false on failure
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
@@ -90,6 +100,13 @@ public function getForm($data = array(), $loadData = true)
 		return $form;
 	}
 
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array    The default data is an empty array.
+	 *
+	 * @since   1.6.2
+	 */
 	protected function loadFormData()
 	{
 		$data = (array) JFactory::getApplication()->getUserState('com_contact.contact.data', array());
@@ -104,7 +121,9 @@ protected function loadFormData()
 	 *
 	 * @param   integer  $pk  Id for the contact
 	 *
-	 * @return mixed Object or null
+	 * @return  mixed Object or null
+	 *
+	 * @since   1.6.0
 	 */
 	public function &getItem($pk = null)
 	{
@@ -122,7 +141,7 @@ public function &getItem($pk = null)
 				$db = $this->getDbo();
 				$query = $db->getQuery(true);
 
-				// Sqlsrv changes
+				// Changes for sqlsrv
 				$case_when = ' CASE WHEN ';
 				$case_when .= $query->charLength('a.alias', '!=', '0');
 				$case_when .= ' THEN ';
@@ -167,7 +186,6 @@ public function &getItem($pk = null)
 				}
 
 				$db->setQuery($query);
-
 				$data = $db->loadObject();
 
 				if (empty($data))
@@ -237,6 +255,15 @@ public function &getItem($pk = null)
 		return $this->_item[$pk];
 	}
 
+	/**
+	 * Gets the query to load a contact item
+	 *
+	 * @param   integer  $pk  The item to be loaded
+	 *
+	 * @return  mixed    The contact object on success, false on failure
+	 *
+	 * @throws  Exception  On database failure
+	 */
 	protected function getContactQuery($pk = null)
 	{
 		// @todo Cache on the fingerprint of the arguments
@@ -308,6 +335,7 @@ protected function getContactQuery($pk = null)
 			catch (Exception $e)
 			{
 				$this->setError($e);
+
 				return false;
 			}
 
@@ -316,7 +344,7 @@ protected function getContactQuery($pk = null)
 				$user	= JFactory::getUser();
 				$groups	= implode(',', $user->getAuthorisedViewLevels());
 
-				//get the content by the linked user
+				// Get the content by the linked user
 				$query	= $db->getQuery(true)
 					->select('a.id')
 					->select('a.title')
@@ -338,29 +366,35 @@ protected function getContactQuery($pk = null)
 				$c_id = $query->castAsChar('c.id');
 				$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
 				$case_when1 .= ' ELSE ';
-				$case_when1 .= $c_id.' END as catslug';
+				$case_when1 .= $c_id . ' END as catslug';
 				$query->select($case_when1 . ',' . $case_when)
 					->from('#__content as a')
 					->join('LEFT', '#__categories as c on a.catid=c.id')
 					->where('a.created_by = ' . (int) $result->user_id)
 					->where('a.access IN (' . $groups . ')')
 					->order('a.state DESC, a.created DESC');
-				// filter per language if plugin published
+
+				// Filter per language if plugin published
 				if (JLanguageMultilang::isEnabled())
 				{
-					$query->where(('a.created_by = ' . (int) $result->user_id) . ' AND ' . ('a.language=' . $db->quote(JFactory::getLanguage()->getTag()) . ' OR a.language=' . $db->quote('*')));
+					$query->where(
+						('a.created_by = ' . (int) $result->user_id) . ' AND ' .
+						('a.language=' . $db->quote(JFactory::getLanguage()->getTag()) . ' OR a.language=' . $db->quote('*'))
+					);
 				}
+
 				if (is_numeric($published))
 				{
 					$query->where('a.state IN (1,2)')
 						->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
 						->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
 				}
+
 				$db->setQuery($query, 0, 10);
 				$articles = $db->loadObjectList();
 				$result->articles = $articles;
 
-				//get the profile information for the linked user
+				// Get the profile information for the linked user
 				require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
 				$userModel = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
 				$data = $userModel->getItem((int) $result->user_id);
@@ -385,6 +419,8 @@ protected function getContactQuery($pk = null)
 				return $result;
 			}
 		}
+
+		return false;
 	}
 
 	/**
diff --git a/components/com_contact/models/featured.php b/components/com_contact/models/featured.php
index 2cd80061d950c..5b77f0f14108d 100644
--- a/components/com_contact/models/featured.php
+++ b/components/com_contact/models/featured.php
@@ -12,45 +12,78 @@
 /**
  * @package     Joomla.Site
  * @subpackage  com_contact
+ * @since       1.6.0
  */
 class ContactModelFeatured extends JModelList
 {
 	/**
 	 * Category items data
 	 *
-	 * @var array
+	 * @var         array
+	 * @since       1.6.0-beta1
+	 * @deprecated  4.0  Variable not used since 1.6.0-beta8
 	 */
 	protected $_item = null;
 
+	/**
+	 * Who knows what this was for? It has never been used
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used ever
+	 */
 	protected $_articles = null;
 
+	/**
+	 * Get the siblings of the category
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used since 1.6.0-beta8
+	 */
 	protected $_siblings = null;
 
+	/**
+	 * Get the children of the category
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used since 1.6.0-beta8
+	 */
 	protected $_children = null;
 
+	/**
+	 * Get the parent of the category
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used since 1.6.0-beta8
+	 */
 	protected $_parent = null;
 
 	/**
 	 * The category that applies.
 	 *
-	 * @access    protected
-	 * @var        object
+	 * @access      protected
+	 * @var         object
+	 * @deprecated   4.0  Variable not used ever
 	 */
 	protected $_category = null;
 
 	/**
-	 * The list of other cotnact categories.
+	 * The list of other contact categories.
 	 *
 	 * @access    protected
-	 * @var        array
+	 * @var       array
+	 * @deprecated   4.0  Variable not used ever
 	 */
 	protected $_categories = null;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
-	 * @see     JController
+	 * @param   array   $config  An optional associative array of configuration settings.
+	 *
 	 * @since   1.6
 	 */
 	public function __construct($config = array())
@@ -100,6 +133,7 @@ public function getItems()
 	 * Method to build an SQL query to load the list data.
 	 *
 	 * @return  string    An SQL query
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -118,20 +152,24 @@ protected function getListQuery()
 			->where('a.featured=1')
 			->join('INNER', '#__categories AS c ON c.id = a.catid')
 			->where('c.access IN (' . $groups . ')');
+
 		// Filter by category.
 		if ($categoryId = $this->getState('category.id'))
 		{
 			$query->where('a.catid = ' . (int) $categoryId);
 		}
-		//sqlsrv change... aliased c.published to cat_published
+
+		// Change for sqlsrv... aliased c.published to cat_published
 		// Join to check for category published state in parent categories up the tree
 		$query->select('c.published as cat_published, CASE WHEN badcats.id is null THEN c.published ELSE 0 END AS parents_published');
 		$subquery = 'SELECT cat.id as id FROM #__categories AS cat JOIN #__categories AS parent ';
 		$subquery .= 'ON cat.lft BETWEEN parent.lft AND parent.rgt ';
 		$subquery .= 'WHERE parent.extension = ' . $db->quote('com_contact');
+
 		// Find any up-path categories that are not published
 		// If all categories are published, badcats.id will be null, and we just use the contact state
 		$subquery .= ' AND parent.published != 1 GROUP BY cat.id ';
+
 		// Select state to unpublished if up-path category is unpublished
 		$publishedWhere = 'CASE WHEN badcats.id is null THEN a.published ELSE 0 END';
 		$query->join('LEFT OUTER', '(' . $subquery . ') AS badcats ON badcats.id = c.id');
@@ -168,6 +206,11 @@ protected function getListQuery()
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
diff --git a/components/com_contact/models/rules/contactemail.php b/components/com_contact/models/rules/contactemail.php
index d6d1c52611710..5af18487fad9f 100644
--- a/components/com_contact/models/rules/contactemail.php
+++ b/components/com_contact/models/rules/contactemail.php
@@ -16,6 +16,7 @@
  *
  * @package     Joomla.Site
  * @subpackage  com_contact
+ * @since       1.6
  */
 class JFormRuleContactEmail extends JFormRuleEmail
 {
@@ -44,7 +45,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 
 		if ($banned)
 		{
-			foreach(explode(';', $banned) as $item)
+			foreach (explode(';', $banned) as $item)
 			{
 				if ($item != '' && JString::stristr($value, $item) !== false)
 				{
diff --git a/components/com_contact/models/rules/contactemailmessage.php b/components/com_contact/models/rules/contactemailmessage.php
index 2358e94218a94..8bfef73f01ee0 100644
--- a/components/com_contact/models/rules/contactemailmessage.php
+++ b/components/com_contact/models/rules/contactemailmessage.php
@@ -14,6 +14,7 @@
  *
  * @package     Joomla.Site
  * @subpackage  com_contact
+ * @since       1.6
  */
 class JFormRuleContactEmailMessage extends JFormRule
 {
@@ -37,7 +38,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 
 		if ($banned)
 		{
-			foreach(explode(';', $banned) as $item)
+			foreach (explode(';', $banned) as $item)
 			{
 				if ($item != '' && JString::stristr($value, $item) !== false)
 				{
diff --git a/components/com_contact/models/rules/contactemailsubject.php b/components/com_contact/models/rules/contactemailsubject.php
index 68fb003bee335..9c5f12cb1d96c 100644
--- a/components/com_contact/models/rules/contactemailsubject.php
+++ b/components/com_contact/models/rules/contactemailsubject.php
@@ -14,6 +14,7 @@
  *
  * @package     Joomla.Site
  * @subpackage  com_contact
+ * @since       1.6
  */
 class JFormRuleContactEmailSubject extends JFormRule
 {
@@ -37,7 +38,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 
 		if ($banned)
 		{
-			foreach(explode(';', $banned) as $item)
+			foreach (explode(';', $banned) as $item)
 			{
 				if ($item != '' && JString::stristr($value, $item) !== false)
 				{
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index 1f8b76a3093a6..604757723741a 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -233,7 +233,7 @@ public function parse(&$segments)
 						->select($db->quoteName('id'))
 						->from('#__contact_details')
 						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
-						->where($db->quoteName('alias') . ' = ' . $db->quote($db->quote($segment)));
+						->where($db->quoteName('alias') . ' = ' . $db->quote($segment));
 					$db->setQuery($query);
 					$nid = $db->loadResult();
 				}
@@ -259,6 +259,10 @@ public function parse(&$segments)
  * These functions are proxys for the new router interface
  * for old SEF extensions.
  *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
  * @deprecated  4.0  Use Class based routers instead
  */
 function ContactBuildRoute(&$query)
@@ -268,6 +272,18 @@ function ContactBuildRoute(&$query)
 	return $router->build($query);
 }
 
+/**
+ * Contact router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
 function ContactParseRoute($segments)
 {
 	$router = new ContactRouter;
diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php
index bc63470005291..6a5f47c2de056 100644
--- a/components/com_contact/views/category/tmpl/default_items.php
+++ b/components/com_contact/views/category/tmpl/default_items.php
@@ -23,7 +23,7 @@
 	<fieldset class="filters btn-toolbar">
 		<?php if ($this->params->get('filter_field') != 'hide') :?>
 			<div class="btn-group">
-				<label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_CONTACT_FILTER_LABEL').'&#160;'; ?></label>
+				<label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_CONTACT_FILTER_LABEL') . '&#160;'; ?></label>
 				<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>" />
 			</div>
 		<?php endif; ?>
diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php
index 1a7daa2cb6158..113dfa1f3e7f6 100644
--- a/components/com_contact/views/category/view.html.php
+++ b/components/com_contact/views/category/view.html.php
@@ -51,7 +51,7 @@ public function display($tpl = null)
 		// Compute the contact slug.
 		foreach ($this->items as $item)
 		{
-			$item->slug	= $item->alias ? ($item->id.':'.$item->alias) : $item->id;
+			$item->slug	= $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
 			$temp		= new JRegistry;
 			$temp->loadString($item->params);
 			$item->params = clone($this->params);
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index 872f86590fafa..c52fd87f09fd9 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -68,7 +68,7 @@
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic-details', JText::_('COM_CONTACT_DETAILS', true)); ?>
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') == 'plain'):?>
-		<?php  echo '<h3>'. JText::_('COM_CONTACT_DETAILS').'</h3>';  ?>
+		<?php  echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>';  ?>
 	<?php endif; ?>
 
 	<?php if ($this->contact->image && $this->params->get('show_image')) : ?>
@@ -89,7 +89,7 @@
 
 	<?php if ($this->params->get('allow_vcard')) :	?>
 		<?php echo JText::_('COM_CONTACT_DOWNLOAD_INFORMATION_AS');?>
-		<a href="<?php echo JRoute::_('index.php?option=com_contact&amp;view=contact&amp;id='.$this->contact->id . '&amp;format=vcf'); ?>">
+		<a href="<?php echo JRoute::_('index.php?option=com_contact&amp;view=contact&amp;id=' . $this->contact->id . '&amp;format=vcf'); ?>">
 		<?php echo JText::_('COM_CONTACT_VCARD');?></a>
 	<?php endif; ?>
 
@@ -109,7 +109,7 @@
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-form', JText::_('COM_CONTACT_EMAIL_FORM', true)); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
-			<?php echo '<h3>'. JText::_('COM_CONTACT_EMAIL_FORM').'</h3>';  ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_EMAIL_FORM') . '</h3>';  ?>
 		<?php endif; ?>
 
 		<?php  echo $this->loadTemplate('form');  ?>
@@ -136,7 +136,7 @@
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-articles', JText::_('JGLOBAL_ARTICLES', true)); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
-			<?php echo '<h3>'. JText::_('JGLOBAL_ARTICLES').'</h3>';  ?>
+			<?php echo '<h3>' . JText::_('JGLOBAL_ARTICLES') . '</h3>';  ?>
 		<?php endif; ?>
 
 		<?php echo $this->loadTemplate('articles'); ?>
@@ -159,7 +159,7 @@
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', JText::_('COM_CONTACT_PROFILE', true)); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
-			<?php echo '<h3>'. JText::_('COM_CONTACT_PROFILE').'</h3>';  ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_PROFILE') . '</h3>';  ?>
 		<?php endif; ?>
 
 		<?php echo $this->loadTemplate('profile'); ?>
@@ -182,7 +182,7 @@
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-misc', JText::_('COM_CONTACT_OTHER_INFORMATION', true)); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
-			<?php echo '<h3>'. JText::_('COM_CONTACT_OTHER_INFORMATION').'</h3>';  ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_OTHER_INFORMATION') . '</h3>';  ?>
 		<?php endif; ?>
 
 		<div class="contact-miscinfo">
diff --git a/components/com_contact/views/contact/tmpl/default_address.php b/components/com_contact/views/contact/tmpl/default_address.php
index 65239dd9cf99e..fcca63f7d16f5 100644
--- a/components/com_contact/views/contact/tmpl/default_address.php
+++ b/components/com_contact/views/contact/tmpl/default_address.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * marker_class: Class based on the selection of text, none, or icons
+ * Marker_class: Class based on the selection of text, none, or icons
  * jicon-text, jicon-none, jicon-icon
  */
 ?>
@@ -28,7 +28,7 @@
 		<?php if ($this->contact->address && $this->params->get('show_street_address')) : ?>
 			<dd>
 				<span class="contact-street" itemprop="streetAddress">
-					<?php echo $this->contact->address .'<br/>'; ?>
+					<?php echo $this->contact->address . '<br/>'; ?>
 				</span>
 			</dd>
 		<?php endif; ?>
@@ -36,7 +36,7 @@
 		<?php if ($this->contact->suburb && $this->params->get('show_suburb')) : ?>
 			<dd>
 				<span class="contact-suburb" itemprop="addressLocality">
-					<?php echo $this->contact->suburb .'<br/>'; ?>
+					<?php echo $this->contact->suburb . '<br/>'; ?>
 				</span>
 			</dd>
 		<?php endif; ?>
@@ -50,14 +50,14 @@
 		<?php if ($this->contact->postcode && $this->params->get('show_postcode')) : ?>
 			<dd>
 				<span class="contact-postcode" itemprop="postalCode">
-					<?php echo $this->contact->postcode .'<br/>'; ?>
+					<?php echo $this->contact->postcode . '<br/>'; ?>
 				</span>
 			</dd>
 		<?php endif; ?>
 		<?php if ($this->contact->country && $this->params->get('show_country')) : ?>
 		<dd>
 			<span class="contact-country" itemprop="addressCountry">
-				<?php echo $this->contact->country .'<br/>'; ?>
+				<?php echo $this->contact->country . '<br/>'; ?>
 			</span>
 		</dd>
 		<?php endif; ?>
diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index 64dcf0732e3dc..fe52411d5b1f4 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -38,39 +38,40 @@
 				<div class="control-label"><?php echo $this->form->getLabel('contact_message'); ?></div>
 				<div class="controls"><?php echo $this->form->getInput('contact_message'); ?></div>
 			</div>
-			<?php if ($this->params->get('show_email_copy')) { ?>
+			<?php if ($this->params->get('show_email_copy')) : ?>
 				<div class="control-group">
 					<div class="control-label"><?php echo $this->form->getLabel('contact_email_copy'); ?></div>
 					<div class="controls"><?php echo $this->form->getInput('contact_email_copy'); ?></div>
 				</div>
-			<?php } ?>
-			<?php //Dynamically load any additional fields from plugins. ?>
+			<?php endif; ?>
+			<?php // Dynamically load any additional fields from plugins. ?>
 			<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
-				<?php if ($fieldset->name != 'contact'):?>
-					<?php $fields = $this->form->getFieldset($fieldset->name);?>
+				<?php if ($fieldset->name != 'contact') : ?>
+					<?php $fields = $this->form->getFieldset($fieldset->name); ?>
 					<?php foreach ($fields as $field) : ?>
 						<div class="control-group">
 							<?php if ($field->hidden) : ?>
 								<div class="controls">
-									<?php echo $field->input;?>
+									<?php echo $field->input; ?>
 								</div>
-							<?php else:?>
+							<?php else: ?>
 								<div class="control-label">
 									<?php echo $field->label; ?>
 									<?php if (!$field->required && $field->type != "Spacer") : ?>
-										<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL');?></span>
+										<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL'); ?></span>
 									<?php endif; ?>
 								</div>
-								<div class="controls"><?php echo $field->input;?></div>
-							<?php endif;?>
+								<div class="controls"><?php echo $field->input; ?></div>
+							<?php endif; ?>
 						</div>
-					<?php endforeach;?>
-				<?php endif ?>
-			<?php endforeach;?>
-			<div class="form-actions"><button class="btn btn-primary validate" type="submit"><?php echo JText::_('COM_CONTACT_CONTACT_SEND'); ?></button>
+					<?php endforeach; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			<div class="form-actions">
+				<button class="btn btn-primary validate" type="submit"><?php echo JText::_('COM_CONTACT_CONTACT_SEND'); ?></button>
 				<input type="hidden" name="option" value="com_contact" />
 				<input type="hidden" name="task" value="contact.submit" />
-				<input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
+				<input type="hidden" name="return" value="<?php echo $this->return_page; ?>" />
 				<input type="hidden" name="id" value="<?php echo $this->contact->slug; ?>" />
 				<?php echo JHtml::_('form.token'); ?>
 			</div>
diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php
index 60b7e112d59de..0478578759055 100644
--- a/components/com_contact/views/contact/tmpl/default_links.php
+++ b/components/com_contact/views/contact/tmpl/default_links.php
@@ -17,22 +17,23 @@
 	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-links', JText::_('COM_CONTACT_LINKS', true)); ?>
 <?php endif; ?>
 <?php if ($this->params->get('presentation_style') == 'plain'):?>
-	<?php echo '<h3>'. JText::_('COM_CONTACT_LINKS').'</h3>';  ?>
+	<?php echo '<h3>' . JText::_('COM_CONTACT_LINKS') . '</h3>';  ?>
 <?php endif; ?>
 
 <div class="contact-links">
 	<ul class="nav nav-tabs nav-stacked">
 		<?php
-		foreach (range('a', 'e') as $char) :// letters 'a' to 'e'
-			$link = $this->contact->params->get('link'.$char);
-			$label = $this->contact->params->get('link'.$char.'_name');
+		// Letters 'a' to 'e'
+		foreach (range('a', 'e') as $char) :
+			$link = $this->contact->params->get('link' . $char);
+			$label = $this->contact->params->get('link' . $char . '_name');
 
 			if (!$link) :
 				continue;
 			endif;
 
 			// Add 'http://' if not present
-			$link = (0 === strpos($link, 'http')) ? $link : 'http://'.$link;
+			$link = (0 === strpos($link, 'http')) ? $link : 'http://' . $link;
 
 			// If no label is present, take the link
 			$label = ($label) ? $label : $link;
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index cb389a167cb9c..40063b584789d 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -20,12 +20,37 @@
  */
 class ContactViewContact extends JViewLegacy
 {
+	/**
+	 * The item model state
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  1.6
+	 */
 	protected $state;
 
+	/**
+	 * The form object for the contact item
+	 *
+	 * @var    JForm
+	 * @since  1.6
+	 */
 	protected $form;
 
+	/**
+	 * The item object details
+	 *
+	 * @var    JObject
+	 * @since  1.6
+	 */
 	protected $item;
 
+	/**
+	 * The page to return to on sumission
+	 *
+	 * @var         string
+	 * @since       1.6
+	 * @deprecated  4.0  Variable not used
+	 */
 	protected $return_page;
 
 	/**
@@ -69,7 +94,7 @@ public function display($tpl = null)
 			return false;
 		}
 
-		// check if access is not public
+		// Check if access is not public
 		$groups	= $user->getAuthorisedViewLevels();
 
 		$return = '';
@@ -88,7 +113,8 @@ public function display($tpl = null)
 		{
 			$item->email_to = JHtml::_('email.cloak', $item->email_to);
 		}
-			if ($params->get('show_street_address') || $params->get('show_suburb') || $params->get('show_state') || $params->get('show_postcode') || $params->get('show_country'))
+			if ($params->get('show_street_address') || $params->get('show_suburb') || $params->get('show_state')
+				|| $params->get('show_postcode') || $params->get('show_country'))
 			{
 				if (!empty ($item->address) || !empty ($item->suburb) || !empty ($item->state) || !empty ($item->country) || !empty ($item->postcode))
 				{
@@ -104,7 +130,7 @@ public function display($tpl = null)
 		switch ($params->get('contact_icons'))
 		{
 			case 1 :
-				// text
+				// Text
 				$params->set('marker_address',   JText::_('COM_CONTACT_ADDRESS') . ": ");
 				$params->set('marker_email',     JText::_('JGLOBAL_EMAIL') . ": ");
 				$params->set('marker_telephone', JText::_('COM_CONTACT_TELEPHONE') . ": ");
@@ -115,7 +141,7 @@ public function display($tpl = null)
 				break;
 
 			case 2 :
-				// none
+				// None
 				$params->set('marker_address',   '');
 				$params->set('marker_email',     '');
 				$params->set('marker_telephone', '');
@@ -128,56 +154,60 @@ public function display($tpl = null)
 			default :
 				if ($params->get('icon_address'))
 				{
-					$image1 = JHtml::_('image', $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS').": ", null, false);
+					$image1 = JHtml::_('image', $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ": ", null, false);
 				}
 				else
 				{
-					$image1 = JHtml::_('image', 'contacts/'.$params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS').": ", null, true);
+					$image1 = JHtml::_('image', 'contacts/' . $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ": ", null, true);
 				}
 
 				if ($params->get('icon_email'))
 				{
-					$image2 = JHtml::_('image', $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL').": ", null, false);
+					$image2 = JHtml::_('image', $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ": ", null, false);
 				}
 				else
 				{
-					$image2 = JHtml::_('image', 'contacts/'.$params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL').": ", null, true);
+					$image2 = JHtml::_('image', 'contacts/' . $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ": ", null, true);
 				}
 
 				if ($params->get('icon_telephone'))
 				{
-					$image3 = JHtml::_('image', $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE').": ", null, false);
+					$image3 = JHtml::_('image', $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ": ", null, false);
 				}
 				else
 				{
-					$image3 = JHtml::_('image', 'contacts/'.$params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE').": ", null, true);
+					$image3 = JHtml::_('image', 'contacts/' . $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ": ", null, true);
 				}
 
 				if ($params->get('icon_fax'))
 				{
-					$image4 = JHtml::_('image', $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX').": ", null, false);
+					$image4 = JHtml::_('image', $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ": ", null, false);
 				}
 				else
 				{
-					$image4 = JHtml::_('image', 'contacts/'.$params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX').": ", null, true);
+					$image4 = JHtml::_('image', 'contacts/' . $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ": ", null, true);
 				}
 
 				if ($params->get('icon_misc'))
 				{
-					$image5 = JHtml::_('image', $params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION').": ", null, false);
+					$image5 = JHtml::_('image', $params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ", null, false);
 				}
 				else
 				{
-					$image5 = JHtml::_('image', 'contacts/'.$params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION').": ", null, true);
+					$image5 = JHtml::_(
+						'image',
+						'contacts/' . $params->get('icon_misc', 'con_info.png'),
+						JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ", null, true
+					);
 				}
 
 				if ($params->get('icon_mobile'))
 				{
-					$image6 = JHtml::_('image', $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE').": ", null, false);
+					$image6 = JHtml::_('image', $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ": ", null, false);
 				}
 				else
 				{
-					$image6 = JHtml::_('image', 'contacts/'.$params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE').": ", null, true);
+					$image6 = JHtml::_('image', 'contacts/' . $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ": ", null, true);
 				}
 
 				$params->set('marker_address',   $image1);
@@ -197,10 +227,11 @@ public function display($tpl = null)
 			{
 				$contact->link = JRoute::_(ContactHelperRoute::getContactRoute($contact->slug, $contact->catid));
 			}
+
 			$item->link = JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid));
 		}
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
 		$this->contact  = &$item;
@@ -239,6 +270,8 @@ public function display($tpl = null)
 
 	/**
 	 * Prepares the document
+	 * 
+	 * @return  void
 	 */
 	protected function _prepareDocument()
 	{
@@ -264,7 +297,7 @@ protected function _prepareDocument()
 
 		$id = (int) @$menu->query['id'];
 
-		// if the menu item does not concern this contact
+		// If the menu item does not concern this contact
 		if ($menu && ($menu->query['option'] != 'com_contact' || $menu->query['view'] != 'contact' || $id != $this->item->id))
 		{
 
diff --git a/components/com_contact/views/contact/view.vcf.php b/components/com_contact/views/contact/view.vcf.php
index de9dfe4fcb2c2..0e3ada7d93920 100644
--- a/components/com_contact/views/contact/view.vcf.php
+++ b/components/com_contact/views/contact/view.vcf.php
@@ -10,13 +10,27 @@
 defined('_JEXEC') or die;
 
 /**
+ * View to create a VCF for a contact item
+ *
  * @package     Joomla.Site
  * @subpackage  com_contact
+ * @since       1.6
  */
 class ContactViewContact extends JViewLegacy
 {
+	/**
+	 * The item model state
+	 *
+	 * @var         \Joomla\Registry\Registry
+	 * @deprecated  4.0  Variable not used
+	 */
 	protected $state;
 
+	/**
+	 * The contact item
+	 *
+	 * @var   JObject
+	 */
 	protected $item;
 
 	/**
diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php
index 1f5a9c9738251..f31381a1debbc 100644
--- a/components/com_contact/views/featured/view.html.php
+++ b/components/com_contact/views/featured/view.html.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * Frontpage View class
+ * Featured View class
  *
  * @package     Joomla.Site
  * @subpackage  com_contact
@@ -18,19 +18,53 @@
  */
 class ContactViewFeatured extends JViewLegacy
 {
+	/**
+	 * The item model state
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  1.6.0
+	 */
 	protected $state;
 
+	/**
+	 * The item details
+	 *
+	 * @var    JObject
+	 * @since  1.6.0
+	 */
 	protected $items;
 
+	/**
+	 * Who knows what this variable was intended for - but it's never been used
+	 *
+	 * @var         array
+	 * @since       1.6.0
+	 * @deprecated  4.0  This variable has been null since 1.6.0-beta8
+	 */
 	protected $category;
 
+	/**
+	 * Who knows what this variable was intended for - but it's never been used
+	 *
+	 * @var         JObject  Maybe.
+	 * @since       1.6.0
+	 * @deprecated  4.0  This variable has never been used ever
+	 */
 	protected $categories;
 
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 * @since  1.6.0
+	 */
 	protected $pagination;
 
 	/**
 	 * Display the view
 	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
 	 * @return  mixed  False on error, null otherwise.
 	 */
 	public function display($tpl = null)
@@ -67,10 +101,13 @@ public function display($tpl = null)
 			if ($item->params->get('show_email', 0) == 1)
 			{
 				$item->email_to = trim($item->email_to);
+
 				if (!empty($item->email_to) && JMailHelper::isEmailAddress($item->email_to))
 				{
 					$item->email_to = JHtml::_('email.cloak', $item->email_to);
-				} else {
+				}
+				else
+				{
 					$item->email_to = '';
 				}
 			}
@@ -96,6 +133,10 @@ public function display($tpl = null)
 
 	/**
 	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/components/com_content/content.php b/components/com_content/content.php
index 9896afed82023..ee8870d0fbf3c 100644
--- a/components/com_content/content.php
+++ b/components/com_content/content.php
@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT.'/helpers/route.php';
-require_once JPATH_COMPONENT.'/helpers/query.php';
+require_once JPATH_COMPONENT . '/helpers/route.php';
+require_once JPATH_COMPONENT . '/helpers/query.php';
 
 $controller = JControllerLegacy::getInstance('Content');
 $controller->execute(JFactory::getApplication()->input->get('task'));
diff --git a/components/com_content/controller.php b/components/com_content/controller.php
index 4ccd604cd4bc0..a258f97615e5b 100644
--- a/components/com_content/controller.php
+++ b/components/com_content/controller.php
@@ -18,6 +18,15 @@
  */
 class ContentController extends JControllerLegacy
 {
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   12.2
+	 */
 	public function __construct($config = array())
 	{
 		$this->input = JFactory::getApplication()->input;
@@ -40,34 +49,52 @@ public function __construct($config = array())
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   boolean  $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
 	 *
-	 * @return  JController		This object to support chaining.
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
 		$cachable = true;
 
-		// Set the default view name and format from the Request.
-		// Note we are using a_id to avoid collisions with the router and the return page.
-		// Frontend is a bit messier than the backend.
+		/**
+		 * Set the default view name and format from the Request.
+		 * Note we are using a_id to avoid collisions with the router and the return page.
+		 * Frontend is a bit messier than the backend.
+		 */
 		$id    = $this->input->getInt('a_id');
 		$vName = $this->input->getCmd('view', 'categories');
 		$this->input->set('view', $vName);
 
 		$user = JFactory::getUser();
 
-		if ($user->get('id') ||
-			($this->input->getMethod() == 'POST' &&
-				(($vName == 'category' && $this->input->get('layout') != 'blog') || $vName == 'archive' )))
+		if ($user->get('id')
+			|| ($this->input->getMethod() == 'POST'
+			&& (($vName == 'category' && $this->input->get('layout') != 'blog') || $vName == 'archive' )))
 		{
 			$cachable = false;
 		}
 
-		$safeurlparams = array('catid' => 'INT', 'id' => 'INT', 'cid' => 'ARRAY', 'year' => 'INT', 'month' => 'INT', 'limit' => 'UINT', 'limitstart' => 'UINT',
-			'showall' => 'INT', 'return' => 'BASE64', 'filter' => 'STRING', 'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'filter-search' => 'STRING', 'print' => 'BOOLEAN', 'lang' => 'CMD', 'Itemid' => 'INT');
+		$safeurlparams = array(
+			'catid' => 'INT',
+			'id' => 'INT',
+			'cid' => 'ARRAY',
+			'year' => 'INT',
+			'month' => 'INT',
+			'limit' => 'UINT',
+			'limitstart' => 'UINT',
+			'showall' => 'INT',
+			'return' => 'BASE64',
+			'filter' => 'STRING',
+			'filter_order' => 'CMD',
+			'filter_order_Dir' => 'CMD',
+			'filter-search' => 'STRING',
+			'print' => 'BOOLEAN',
+			'lang' => 'CMD',
+			'Itemid' => 'INT');
 
 		// Check for edit form.
 		if ($vName == 'form' && !$this->checkEditId('com_content.edit.article', $id))
diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
index 4b9c0d68795ac..f9fdc28d9f5dc 100644
--- a/components/com_content/controllers/article.php
+++ b/components/com_content/controllers/article.php
@@ -73,7 +73,7 @@ protected function allowAdd($data = array())
 		if ($categoryId)
 		{
 			// If the category has been passed in the data or URL check it.
-			$allow	= $user->authorise('core.create', 'com_content.category.'.$categoryId);
+			$allow	= $user->authorise('core.create', 'com_content.category.' . $categoryId);
 		}
 
 		if ($allow === null)
@@ -116,6 +116,7 @@ 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.
@@ -212,25 +213,28 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'a_id')
 	{
 		// Need to override the parent method completely.
 		$tmpl   = $this->input->get('tmpl');
-//		$layout = $this->input->get('layout', 'edit');
+
 		$append = '';
 
 		// Setup redirect info.
 		if ($tmpl)
 		{
-			$append .= '&tmpl='.$tmpl;
+			$append .= '&tmpl=' . $tmpl;
 		}
 
 		// TODO This is a bandaid, not a long term solution.
-//		if ($layout)
-//		{
-//			$append .= '&layout=' . $layout;
-//		}
+		/**
+		 * if ($layout)
+		 * {
+		 *	$append .= '&layout=' . $layout;
+		 * }
+		 */
+
 		$append .= '&layout=edit';
 
 		if ($recordId)
 		{
-			$append .= '&'.$urlVar.'='.$recordId;
+			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		$itemId	= $this->input->getInt('Itemid');
@@ -239,17 +243,17 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'a_id')
 
 		if ($itemId)
 		{
-			$append .= '&Itemid='.$itemId;
+			$append .= '&Itemid=' . $itemId;
 		}
 
 		if ($catId)
 		{
-			$append .= '&catid='.$catId;
+			$append .= '&catid=' . $catId;
 		}
 
 		if ($return)
 		{
-			$append .= '&return='.base64_encode($return);
+			$append .= '&return=' . base64_encode($return);
 		}
 
 		return $append;
@@ -281,8 +285,8 @@ protected function getReturnPage()
 	/**
 	 * Function that allows child controller access to model data after the data has been saved.
 	 *
-	 * @param   JModelLegacy  $model  The data model object.
-	 * @param   array         $validData   The validated data.
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
 	 *
 	 * @return  void
 	 *
diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php
index 9d7779b57ade2..fafc5911e8e11 100644
--- a/components/com_content/helpers/association.php
+++ b/components/com_content/helpers/association.php
@@ -64,6 +64,5 @@ public static function getAssociations($id = 0, $view = null)
 		}
 
 		return array();
-
 	}
 }
diff --git a/components/com_content/helpers/category.php b/components/com_content/helpers/category.php
index 05953fd8f4ea8..cc45328d78772 100644
--- a/components/com_content/helpers/category.php
+++ b/components/com_content/helpers/category.php
@@ -18,6 +18,13 @@
  */
 class ContentCategories extends JCategories
 {
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   11.1
+	 */
 	public function __construct($options = array())
 	{
 		$options['table'] = '#__content';
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index 6508de09ff7bd..9afdbadadb3a5 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -127,6 +127,7 @@ public static function email($article, $params, $attribs = array(), $legacy = fa
 	 * @param   boolean    $legacy   True to use legacy images, false to use icomoon based graphic
 	 *
 	 * @return  string	The HTML for the article edit icon.
+	 *
 	 * @since   1.6
 	 */
 	public static function edit($article, $params, $attribs = array(), $legacy = false)
@@ -149,14 +150,18 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 		JHtml::_('bootstrap.tooltip');
 
 		// Show checked_out icon if the article is checked out by a different user
-		if (property_exists($article, 'checked_out') && property_exists($article, 'checked_out_time') && $article->checked_out > 0 && $article->checked_out != $user->get('id'))
+		if (property_exists($article, 'checked_out')
+			&& property_exists($article, 'checked_out_time')
+			&& $article->checked_out > 0
+			&& $article->checked_out != $user->get('id'))
 		{
 			$checkoutUser = JFactory::getUser($article->checked_out);
 			$button       = JHtml::_('image', 'system/checked_out.png', null, null, true);
 			$date         = JHtml::_('date', $article->checked_out_time);
-			$tooltip      = JText::_('JLIB_HTML_CHECKED_OUT') . ' :: ' . JText::sprintf('COM_CONTENT_CHECKED_OUT_BY', $checkoutUser->name) . ' <br /> ' . $date;
+			$tooltip      = JText::_('JLIB_HTML_CHECKED_OUT') . ' :: ' . JText::sprintf('COM_CONTENT_CHECKED_OUT_BY', $checkoutUser->name)
+				. ' <br /> ' . $date;
 
-			return '<span class="hasTooltip" title="' . JHtml::tooltipText($tooltip. '', 0) . '">' . $button . '</span>';
+			return '<span class="hasTooltip" title="' . JHtml::tooltipText($tooltip . '', 0) . '">' . $button . '</span>';
 		}
 
 		$url = 'index.php?option=com_content&task=article.edit&a_id=' . $article->id . '&return=' . base64_encode($uri);
@@ -181,22 +186,28 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 		if ($legacy)
 		{
 			$icon = $article->state ? 'edit.png' : 'edit_unpublished.png';
+
 			if (strtotime($article->publish_up) > strtotime(JFactory::getDate())
 				|| ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != '0000-00-00 00:00:00'))
 			{
 				$icon = 'edit_unpublished.png';
 			}
+
 			$text = JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true);
 		}
 		else
 		{
 			$icon = $article->state ? 'edit' : 'eye-close';
+
 			if (strtotime($article->publish_up) > strtotime(JFactory::getDate())
 				|| ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != '0000-00-00 00:00:00'))
 			{
 				$icon = 'eye-close';
 			}
-			$text = '<span class="hasTooltip icon-' . $icon . ' tip" title="' . JHtml::tooltipText(JText::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0) . '"></span>&#160;' . JText::_('JGLOBAL_EDIT') . '&#160;';
+
+			$text = '<span class="hasTooltip icon-' . $icon . ' tip" title="' . JHtml::tooltipText(JText::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0)
+				. '"></span>&#160;'
+				. JText::_('JGLOBAL_EDIT') . '&#160;';
 		}
 
 		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
@@ -225,7 +236,7 @@ public static function print_popup($article, $params, $attribs = array(), $legac
 
 		$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
 
-		// checks template image directory for image, if non found default are loaded
+		// Checks template image directory for image, if non found default are loaded
 		if ($params->get('show_icons'))
 		{
 			if ($legacy)
@@ -280,5 +291,4 @@ public static function print_screen($article, $params, $attribs = array(), $lega
 
 		return '<a href="#" onclick="window.print();return false;">' . $text . '</a>';
 	}
-
 }
diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php
index b58c3022d7d5c..4f36b588d1b6e 100644
--- a/components/com_content/helpers/query.php
+++ b/components/com_content/helpers/query.php
@@ -22,9 +22,10 @@ class ContentHelperQuery
 	/**
 	 * Translate an order code to a field for primary category ordering.
 	 *
-	 * @param   string	$orderby	The ordering code.
+	 * @param   string  $orderby  The ordering code.
+	 *
+	 * @return  string  The SQL field(s) to order by.
 	 *
-	 * @return  string	The SQL field(s) to order by.
 	 * @since   1.5
 	 */
 	public static function orderbyPrimary($orderby)
@@ -54,10 +55,11 @@ public static function orderbyPrimary($orderby)
 	/**
 	 * Translate an order code to a field for secondary category ordering.
 	 *
-	 * @param   string	$orderby	The ordering code.
-	 * @param   string	$orderDate	The ordering code for the date.
+	 * @param   string  $orderby    The ordering code.
+	 * @param   string  $orderDate  The ordering code for the date.
+	 *
+	 * @return  string  The SQL field(s) to order by.
 	 *
-	 * @return  string	The SQL field(s) to order by.
 	 * @since   1.5
 	 */
 	public static function orderbySecondary($orderby, $orderDate = 'created')
@@ -117,9 +119,10 @@ public static function orderbySecondary($orderby, $orderDate = 'created')
 	/**
 	 * Translate an order code to a field for primary category ordering.
 	 *
-	 * @param   string	$orderDate	The ordering code.
+	 * @param   string  $orderDate  The ordering code.
+	 *
+	 * @return  string  The SQL field(s) to order by.
 	 *
-	 * @return  string	The SQL field(s) to order by.
 	 * @since   1.6
 	 */
 	public static function getQueryDate($orderDate)
@@ -132,7 +135,7 @@ public static function getQueryDate($orderDate)
 				$queryDate = ' CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END';
 				break;
 
-			// use created if publish_up is not set
+			// Use created if publish_up is not set
 			case 'published' :
 				$queryDate = ' CASE WHEN a.publish_up = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END ';
 				break;
@@ -149,12 +152,13 @@ public static function getQueryDate($orderDate)
 	/**
 	 * Get join information for the voting query.
 	 *
-	 * @param   JRegistry	$param	An options object for the article.
+	 * @param   \Joomla\Registry\Registry  $params  An options object for the article.
 	 *
-	 * @return  array  	A named array with "select" and "join" keys.
+	 * @return  array  A named array with "select" and "join" keys.
+	 * 
 	 * @since   1.5
 	 */
-	public static function buildVotingQuery($params=null)
+	public static function buildVotingQuery($params = null)
 	{
 		if (!$params)
 		{
@@ -165,7 +169,7 @@ public static function buildVotingQuery($params=null)
 
 		if ($voting)
 		{
-			// calculate voting count
+			// Calculate voting count
 			$select = ' , ROUND(v.rating_sum / v.rating_count) AS rating, v.rating_count';
 			$join = ' LEFT JOIN #__content_rating AS v ON a.id = v.content_id';
 		}
@@ -188,24 +192,26 @@ public static function buildVotingQuery($params=null)
 	 * across columns in the layout, the result is that the
 	 * desired article ordering is achieved down the columns.
 	 *
-	 * @param   array  $articles	Array of intro text articles
-	 * @param   integer	$numColumns	Number of columns in the layout
+	 * @param   array    &$articles   Array of intro text articles
+	 * @param   integer  $numColumns  Number of columns in the layout
 	 *
 	 * @return  array  Reordered array to achieve desired ordering down columns
+	 *
 	 * @since   1.6
 	 */
 	public static function orderDownColumns(&$articles, $numColumns = 1)
 	{
 		$count = count($articles);
 
-		// just return the same array if there is nothing to change
+		// Just return the same array if there is nothing to change
 		if ($numColumns == 1 || !is_array($articles) || $count <= $numColumns)
 		{
 			$return = $articles;
 		}
-		// we need to re-order the intro articles array
-		else {
-			// we need to preserve the original array keys
+		// We need to re-order the intro articles array
+		else
+		{
+			// We need to preserve the original array keys
 			$keys = array_keys($articles);
 
 			$maxRows = ceil($count / $numColumns);
@@ -213,30 +219,32 @@ public static function orderDownColumns(&$articles, $numColumns = 1)
 			$numEmpty = $numCells - $count;
 			$index = array();
 
-			// calculate number of empty cells in the array
-
-			// fill in all cells of the array
-			// put -1 in empty cells so we can skip later
+			// Calculate number of empty cells in the array
 
+			// Fill in all cells of the array
+			// Put -1 in empty cells so we can skip later
 			for ($row = 1, $i = 1; $row <= $maxRows; $row++)
 			{
 				for ($col = 1; $col <= $numColumns; $col++)
 				{
 					if ($numEmpty > ($numCells - $i))
 					{
-						// put -1 in empty cells
+						// Put -1 in empty cells
 						$index[$row][$col] = -1;
 					}
-					else {
-						// put in zero as placeholder
+					else
+					{
+						// Put in zero as placeholder
 						$index[$row][$col] = 0;
 					}
+
 					$i++;
 				}
 			}
 
-			// layout the articles in column order, skipping empty cells
+			// Layout the articles in column order, skipping empty cells
 			$i = 0;
+
 			for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
 			{
 				for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
@@ -249,10 +257,11 @@ public static function orderDownColumns(&$articles, $numColumns = 1)
 				}
 			}
 
-			// now read the $index back row by row to get articles in right row/col
+			// Now read the $index back row by row to get articles in right row/col
 			// so that they will actually be ordered down the columns (when read by row in the layout)
 			$return = array();
 			$i = 0;
+
 			for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
 			{
 				for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
@@ -262,6 +271,7 @@ public static function orderDownColumns(&$articles, $numColumns = 1)
 				}
 			}
 		}
+
 		return $return;
 	}
 }
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index aeefdc95bb17e..bccef8fd852b4 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -24,7 +24,15 @@ abstract class ContentHelperRoute
 	protected static $lang_lookup = array();
 
 	/**
-	 * @param   integer  The route of the content item
+	 * Get the article route.
+	 *
+	 * @param   integer  $id        The route of the content item.
+	 * @param   integer  $catid     The category ID.
+	 * @param   integer  $language  The language code.
+	 *
+	 * @return  string  The article route.
+	 *
+	 * @since   1.5
 	 */
 	public static function getArticleRoute($id, $catid = 0, $language = 0)
 	{
@@ -67,6 +75,16 @@ public static function getArticleRoute($id, $catid = 0, $language = 0)
 		return $link;
 	}
 
+	/**
+	 * Get the category route.
+	 *
+	 * @param   integer  $catid     The category ID.
+	 * @param   integer  $language  The language code.
+	 *
+	 * @return  string  The article route.
+	 *
+	 * @since   1.5
+	 */
 	public static function getCategoryRoute($catid, $language = 0)
 	{
 		if ($catid instanceof JCategoryNode)
@@ -96,7 +114,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			{
 				self::buildLanguageLookup();
 
-				if(isset(self::$lang_lookup[$language]))
+				if (isset(self::$lang_lookup[$language]))
 				{
 					$link .= '&lang=' . self::$lang_lookup[$language];
 					$needles['language'] = $language;
@@ -112,6 +130,15 @@ public static function getCategoryRoute($catid, $language = 0)
 		return $link;
 	}
 
+	/**
+	 * Get the form route.
+	 *
+	 * @param   integer  $id  The form ID.
+	 *
+	 * @return  string  The article route.
+	 *
+	 * @since   1.5
+	 */
 	public static function getFormRoute($id)
 	{
 		// Create the link
@@ -127,6 +154,13 @@ public static function getFormRoute($id)
 		return $link;
 	}
 
+	/**
+	 * Look up language codes.
+	 *
+	 * @return  void.
+	 *
+	 * @since   1.5
+	 */
 	protected static function buildLanguageLookup()
 	{
 		if (count(self::$lang_lookup) == 0)
@@ -147,6 +181,15 @@ protected static function buildLanguageLookup()
 		}
 	}
 
+	/**
+	 * Find an item ID.
+	 *
+	 * @param   array  $needles  An array of language codes.
+	 *
+	 * @return  mixed  The ID found or null otherwise.
+	 *
+	 * @since   1.5
+	 */
 	protected static function _findItem($needles = null)
 	{
 		$app      = JFactory::getApplication();
@@ -218,7 +261,9 @@ protected static function _findItem($needles = null)
 		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
 
-		if ($active && $active->component == 'com_content' && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
+		if ($active
+			&& $active->component == 'com_content'
+			&& ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
diff --git a/components/com_content/models/archive.php b/components/com_content/models/archive.php
index e9af74dadadc1..99d1c8881009a 100644
--- a/components/com_content/models/archive.php
+++ b/components/com_content/models/archive.php
@@ -32,6 +32,11 @@ class ContentModelArchive extends ContentModelArticles
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -60,7 +65,11 @@ protected function populateState($ordering = null, $direction = null)
 	}
 
 	/**
+	 * Get the master query for retrieving a list of articles subject to the model state.
+	 *
 	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
 	 */
 	protected function getListQuery()
 	{
@@ -77,18 +86,19 @@ protected function getListQuery()
 		$orderby = $primary . ' ' . $secondary . ' a.created DESC ';
 		$this->setState('list.ordering', $orderby);
 		$this->setState('list.direction', '');
+
 		// Create a new query object.
 		$query = parent::getListQuery();
 
 			// Add routing for archive
-			//sqlsrv changes
+			// Sqlsrv changes
 		$case_when = ' CASE WHEN ';
 		$case_when .= $query->charLength('a.alias', '!=', '0');
 		$case_when .= ' THEN ';
 		$a_id = $query->castAsChar('a.id');
 		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
 		$case_when .= ' ELSE ';
-		$case_when .= $a_id.' END as slug';
+		$case_when .= $a_id . ' END as slug';
 
 		$query->select($case_when);
 
@@ -98,7 +108,7 @@ protected function getListQuery()
 		$c_id = $query->castAsChar('c.id');
 		$case_when .= $query->concatenate(array($c_id, 'c.alias'), ':');
 		$case_when .= ' ELSE ';
-		$case_when .= $c_id.' END as catslug';
+		$case_when .= $c_id . ' END as catslug';
 		$query->select($case_when);
 
 		// Filter on month, year
@@ -107,16 +117,14 @@ protected function getListQuery()
 
 		if ($month = $this->getState('filter.month'))
 		{
-			$query->where('MONTH('. $queryDate . ') = ' . $month);
+			$query->where('MONTH(' . $queryDate . ') = ' . $month);
 		}
 
 		if ($year = $this->getState('filter.year'))
 		{
-			$query->where('YEAR('. $queryDate . ') = ' . $year);
+			$query->where('YEAR(' . $queryDate . ') = ' . $year);
 		}
 
-		//echo nl2br(str_replace('#__','jos_',$query));
-
 		return $query;
 	}
 
@@ -148,12 +156,24 @@ public function getData()
 		return $this->_data;
 	}
 
-	// JModelLegacy override to add alternating value for $odd
+	/**
+	 * JModelLegacy override to add alternating value for $odd
+	 *
+	 * @param   string   $query       The query.
+	 * @param   integer  $limitstart  Offset.
+	 * @param   integer  $limit       The number of records.
+	 *
+	 * @return  array  An array of results.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
 	protected function _getList($query, $limitstart=0, $limit=0)
 	{
 		$result = parent::_getList($query, $limitstart, $limit);
 
 		$odd = 1;
+
 		foreach ($result as $k => $row)
 		{
 			$result[$k]->odd = $odd;
diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php
index 9319dda67e190..0f6bd63e72de9 100644
--- a/components/com_content/models/article.php
+++ b/components/com_content/models/article.php
@@ -125,7 +125,8 @@ public function getItem($pk = null)
 
 					->where('a.id = ' . (int) $pk);
 
-				if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content'))) {
+				if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+				{
 					// Filter by start and end dates.
 					$nullDate = $db->quote($db->getNullDate());
 					$date = JFactory::getDate();
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index 5d1ef3d75e9cb..255775e830dca 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -448,8 +448,8 @@ protected function getListQuery()
 		// Filter by start and end dates.
 		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
 		{
-			$query	->where('(a.publish_up = '.$nullDate.' OR a.publish_up <= '.$nowDate.')')
-				->where('(a.publish_down = '.$nullDate.' OR a.publish_down >= '.$nowDate.')');
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
 		}
 
 		// Filter by Date Range or Relative Date
diff --git a/components/com_content/models/categories.php b/components/com_content/models/categories.php
index 93bc8b9f47754..ad7c006bf0c0b 100644
--- a/components/com_content/models/categories.php
+++ b/components/com_content/models/categories.php
@@ -41,6 +41,11 @@ class ContentModelCategories extends JModelList
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -66,17 +71,17 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id	A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
 	 */
 	protected function getStoreId($id = '')
 	{
 		// Compile the store id.
-		$id	.= ':'.$this->getState('filter.extension');
-		$id	.= ':'.$this->getState('filter.published');
-		$id	.= ':'.$this->getState('filter.access');
-		$id	.= ':'.$this->getState('filter.parentId');
+		$id	.= ':' . $this->getState('filter.extension');
+		$id	.= ':' . $this->getState('filter.published');
+		$id	.= ':' . $this->getState('filter.access');
+		$id	.= ':' . $this->getState('filter.parentId');
 
 		return parent::getStoreId($id);
 	}
@@ -84,9 +89,10 @@ protected function getStoreId($id = '')
 	/**
 	 * Redefine the function an add some properties to make the styling more easy
 	 *
-	 * @param   bool	$recursive	True if you want to return children recursively.
+	 * @param   bool  $recursive  True if you want to return children recursively.
 	 *
 	 * @return  mixed  An array of data items on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function getItems($recursive = false)
@@ -112,7 +118,8 @@ public function getItems($recursive = false)
 			{
 				$this->_items = $this->_parent->getChildren($recursive);
 			}
-			else {
+			else
+			{
 				$this->_items = false;
 			}
 		}
@@ -120,6 +127,13 @@ public function getItems($recursive = false)
 		return $this->_items;
 	}
 
+	/**
+	 * Get the parent.
+	 *
+	 * @return  object  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
 	public function getParent()
 	{
 		if (!is_object($this->_parent))
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index 565ea128c21fa..75a5c8badc66d 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -60,8 +60,8 @@ class ContentModelCategory extends JModelList
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
-	 * @see     JController
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @since   1.6
 	 */
 	public function __construct($config = array())
@@ -98,7 +98,11 @@ public function __construct($config = array())
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
-	 * return	void
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -136,7 +140,7 @@ protected function populateState($ordering = null, $direction = null)
 
 		if ((!$user->authorise('core.edit.state', $asset)) &&  (!$user->authorise('core.edit', $asset)))
 		{
-			// limit to published for people who can't edit or edit.state.
+			// Limit to published for people who can't edit or edit.state.
 			$this->setState('filter.published', 1);
 
 			// Filter by start and end dates.
@@ -151,7 +155,7 @@ protected function populateState($ordering = null, $direction = null)
 			$this->setState('filter.published', array(0, 1, 2));
 		}
 
-		// process show_noauth parameter
+		// Process show_noauth parameter
 		if (!$params->get('show_noauth'))
 		{
 			$this->setState('filter.access', true);
@@ -164,26 +168,29 @@ protected function populateState($ordering = null, $direction = null)
 		// Optional filter text
 		$this->setState('list.filter', $app->input->getString('filter-search'));
 
-		// filter.order
+		// Filter.order
 		$itemid = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
 		$orderCol = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
+
 		if (!in_array($orderCol, $this->filter_fields))
 		{
 			$orderCol = 'a.ordering';
 		}
+
 		$this->setState('list.ordering', $orderCol);
 
-		$listOrder = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir',
-			'filter_order_Dir', '', 'cmd');
+		$listOrder = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir', 'filter_order_Dir', '', 'cmd');
+
 		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
 		{
 			$listOrder = 'ASC';
 		}
+
 		$this->setState('list.direction', $listOrder);
 
 		$this->setState('list.start', $app->input->get('limitstart', 0, 'uint'));
 
-		// set limit for query. If list, use parameter. If blog, add blog parameters for limit.
+		// Set limit for query. If list, use parameter. If blog, add blog parameters for limit.
 		if (($app->input->get('layout') == 'blog') || $params->get('layout_type') == 'blog')
 		{
 			$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
@@ -196,7 +203,7 @@ protected function populateState($ordering = null, $direction = null)
 
 		$this->setState('list.limit', $limit);
 
-		// set the depth of the category query based on parameter
+		// Set the depth of the category query based on parameter
 		$showSubcategories = $params->get('show_subcategory_content', '0');
 
 		if ($showSubcategories)
@@ -208,16 +215,16 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.language', JLanguageMultilang::isEnabled());
 
 		$this->setState('layout', $app->input->getString('layout'));
-
 	}
 
 	/**
 	 * Get the articles in the category
 	 *
 	 * @return  mixed  An array of articles or false if an error occurs.
+	 *
 	 * @since   1.5
 	 */
-	function getItems()
+	public function getItems()
 	{
 		$limit = $this->getState('list.limit');
 
@@ -234,7 +241,8 @@ function getItems()
 			$model->setState('list.limit', $limit);
 			$model->setState('list.direction', $this->getState('list.direction'));
 			$model->setState('list.filter', $this->getState('list.filter'));
-			// filter.subcategories indicates whether to include articles from subcategories in the list or blog
+
+			// Filter.subcategories indicates whether to include articles from subcategories in the list or blog
 			$model->setState('filter.subcategories', $this->getState('filter.subcategories'));
 			$model->setState('filter.max_category_levels', $this->getState('filter.max_category_levels'));
 			$model->setState('list.links', $this->getState('list.links'));
@@ -263,6 +271,7 @@ function getItems()
 	 * Build the orderby for the query
 	 *
 	 * @return  string	$orderby portion of query
+	 *
 	 * @since   1.5
 	 */
 	protected function _buildContentOrderBy()
@@ -301,34 +310,42 @@ protected function _buildContentOrderBy()
 		return $orderby;
 	}
 
+	/**
+	 * Method to get a JPagination object for the data set.
+	 *
+	 * @return  JPagination  A JPagination object for the data set.
+	 *
+	 * @since   12.2
+	 */
 	public function getPagination()
 	{
 		if (empty($this->_pagination))
 		{
 			return null;
 		}
+
 		return $this->_pagination;
 	}
 
 	/**
 	 * Method to get category data for the current category
 	 *
-	 * @param   integer  An optional ID
-	 *
 	 * @return  object
+	 *
 	 * @since   1.5
 	 */
 	public function getCategory()
 	{
 		if (!is_object($this->_item))
 		{
-			if ( isset( $this->state->params ) )
+			if (isset( $this->state->params))
 			{
 				$params = $this->state->params;
 				$options = array();
 				$options['countItems'] = $params->get('show_cat_num_articles', 1) || !$params->get('show_empty_categories_cat', 0);
 			}
-			else {
+			else
+			{
 				$options['countItems'] = 0;
 			}
 
@@ -339,7 +356,7 @@ public function getCategory()
 			if (is_object($this->_item))
 			{
 				$user	= JFactory::getUser();
-				$asset	= 'com_content.category.'.$this->_item->id;
+				$asset	= 'com_content.category.' . $this->_item->id;
 
 				// Check general create permission.
 				if ($user->authorise('core.create', $asset))
@@ -359,7 +376,8 @@ public function getCategory()
 				$this->_rightsibling = $this->_item->getSibling();
 				$this->_leftsibling = $this->_item->getSibling(false);
 			}
-			else {
+			else
+			{
 				$this->_children = false;
 				$this->_parent = false;
 			}
@@ -371,9 +389,8 @@ public function getCategory()
 	/**
 	 * Get the parent category.
 	 *
-	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
-	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
 	 * @since   1.6
 	 */
 	public function getParent()
@@ -390,9 +407,10 @@ public function getParent()
 	 * Get the left sibling (adjacent) categories.
 	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
 	 * @since   1.6
 	 */
-	function &getLeftSibling()
+	public function &getLeftSibling()
 	{
 		if (!is_object($this->_item))
 		{
@@ -406,9 +424,10 @@ function &getLeftSibling()
 	 * Get the right sibling (adjacent) categories.
 	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
 	 * @since   1.6
 	 */
-	function &getRightSibling()
+	public function &getRightSibling()
 	{
 		if (!is_object($this->_item))
 		{
@@ -421,12 +440,11 @@ function &getRightSibling()
 	/**
 	 * Get the child categories.
 	 *
-	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
-	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
 	 * @since   1.6
 	 */
-	function &getChildren()
+	public function &getChildren()
 	{
 		if (!is_object($this->_item))
 		{
@@ -437,10 +455,11 @@ function &getChildren()
 		if (count($this->_children))
 		{
 			$params = $this->getState()->get('params');
+
 			if ($params->get('orderby_pri') == 'alpha' || $params->get('orderby_pri') == 'ralpha')
 			{
 				jimport('joomla.utilities.arrayhelper');
-				JArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') == 'alpha') ? 1 : -1);
+				JArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') == 'alpha') ? 1 : (-1));
 			}
 		}
 
diff --git a/components/com_content/models/featured.php b/components/com_content/models/featured.php
index 31e910dbafa0f..d6e328fb3c482 100644
--- a/components/com_content/models/featured.php
+++ b/components/com_content/models/featured.php
@@ -32,6 +32,11 @@ class ContentModelFeatured extends ContentModelArticles
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void.
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -52,8 +57,9 @@ protected function populateState($ordering = null, $direction = null)
 
 		$this->setState('filter.frontpage', true);
 
-		if ((!$user->authorise('core.edit.state', 'com_content')) &&  (!$user->authorise('core.edit', 'com_content'))){
-			// filter on published for those who do not have edit or edit.state rights.
+		if ((!$user->authorise('core.edit.state', 'com_content')) &&  (!$user->authorise('core.edit', 'com_content')))
+		{
+			// Filter on published for those who do not have edit or edit.state rights.
 			$this->setState('filter.published', 1);
 		}
 		else
@@ -61,7 +67,7 @@ protected function populateState($ordering = null, $direction = null)
 			$this->setState('filter.published', array(0, 1, 2));
 		}
 
-		// check for category selection
+		// Check for category selection
 		if ($params->get('featured_categories') && implode(',', $params->get('featured_categories')) == true)
 		{
 			$featuredCategories = $params->get('featured_categories');
@@ -78,13 +84,15 @@ public function getItems()
 	{
 		$params = clone $this->getState('params');
 		$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+
 		if ($limit > 0)
 		{
 			$this->setState('list.limit', $limit);
+
 			return parent::getItems();
 		}
-		return array();
 
+		return array();
 	}
 
 	/**
@@ -94,7 +102,7 @@ public function getItems()
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id	A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
 	 */
@@ -107,6 +115,8 @@ protected function getStoreId($id = '')
 	}
 
 	/**
+	 * Get the list of items.
+	 *
 	 * @return  JDatabaseQuery
 	 */
 	protected function getListQuery()
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index b98a4141575ec..5f8f91f0956ac 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Base this model on the backend version.
-require_once JPATH_ADMINISTRATOR.'/components/com_content/models/article.php';
+require_once JPATH_ADMINISTRATOR . '/components/com_content/models/article.php';
 
 /**
  * Content Component Article Model
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 42dd8a609f64f..af9847da6978b 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -67,7 +67,10 @@ public function build(&$query)
 		}
 
 		// Are we dealing with an article or category that is attached to a menu item?
-		if (($menuItem instanceof stdClass) && $menuItem->query['view'] == $query['view'] && isset($query['id']) && $menuItem->query['id'] == (int) $query['id'])
+		if (($menuItem instanceof stdClass)
+			&& $menuItem->query['view'] == $query['view']
+			&& isset($query['id'])
+			&& $menuItem->query['id'] == (int) $query['id'])
 		{
 			unset($query['view']);
 
@@ -389,6 +392,7 @@ public function parse(&$segments)
 		if (!$category)
 		{
 			JError::raiseError(404, JText::_('COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND'));
+
 			return $vars;
 		}
 
@@ -423,7 +427,7 @@ public function parse(&$segments)
 						->select($db->quoteName('id'))
 						->from('#__content')
 						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
-						->where($db->quoteName('alias') . ' = ' . $db->quote($db->quote($segment)));
+						->where($db->quoteName('alias') . ' = ' . $db->quote($segment));
 					$db->setQuery($query);
 					$cid = $db->loadResult();
 				}
@@ -459,16 +463,33 @@ public function parse(&$segments)
  * These functions are proxys for the new router interface
  * for old SEF extensions.
  *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
  * @deprecated  4.0  Use Class based routers instead
  */
-function ContentBuildRoute(&$query)
+function contentBuildRoute(&$query)
 {
 	$router = new ContentRouter;
 
 	return $router->build($query);
 }
 
-function ContentParseRoute($segments)
+/**
+ * Parse the segments of a URL.
+ *
+ * This function is a proxy for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @since   3.3
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function contentParseRoute($segments)
 {
 	$router = new ContentRouter;
 
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index ecf0a989de5aa..dfef79bca25f7 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -82,6 +82,7 @@ public function display($tpl = null)
 		}
 
 		$form = new stdClass;
+
 		// Month Field
 		$months = array(
 			'' => JText::_('COM_CONTENT_MONTH'),
@@ -108,13 +109,16 @@ public function display($tpl = null)
 				'option.key' => null
 			)
 		);
+
 		// Year Field
 		$years = array();
 		$years[] = JHtml::_('select.option', null, JText::_('JYEAR'));
+
 		for ($year = date('Y'), $i = $year - 10; $i <= $year; $i++)
 		{
 			$years[] = JHtml::_('select.option', $i, $i);
 		}
+
 		$form->yearField = JHtml::_(
 			'select.genericlist',
 			$years,
@@ -123,7 +127,7 @@ public function display($tpl = null)
 		);
 		$form->limitField = $pagination->getLimitBox();
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
 		$this->filter     = $state->get('list.filter');
@@ -140,6 +144,8 @@ public function display($tpl = null)
 
 	/**
 	 * Prepares the document
+	 *
+	 * @return  void.
 	 */
 	protected function _prepareDocument()
 	{
@@ -150,6 +156,7 @@ protected function _prepareDocument()
 		// Because the application sets a default page title,
 		// we need to get it from the menu item itself
 		$menu = $menus->getActive();
+
 		if ($menu)
 		{
 			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 9aaca516518b1..a0fae0851cc89 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -45,11 +45,7 @@
 	<div class="page-header">
 		<h2 itemprop="name">
 			<?php if ($params->get('show_title')) : ?>
-				<?php if ($params->get('link_titles') && !empty($this->item->readmore_link)) : ?>
-					<a href="<?php echo $this->item->readmore_link; ?>" itemprop="url"> <?php echo $this->escape($this->item->title); ?></a>
-				<?php else : ?>
-					<?php echo $this->escape($this->item->title); ?>
-				<?php endif; ?>
+				<?php echo $this->escape($this->item->title); ?>
 			<?php endif; ?>
 		</h2>
 		<?php if ($this->item->state == 0) : ?>
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index ae2df325c5bf1..4a3f9879cec26 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -50,6 +50,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -58,8 +59,8 @@ public function display($tpl = null)
 		$item->tagLayout = new JLayoutFile('joomla.content.tags');
 
 		// Add router helpers.
-		$item->slug			= $item->alias ? ($item->id.':'.$item->alias) : $item->id;
-		$item->catslug		= $item->category_alias ? ($item->catid.':'.$item->category_alias) : $item->catid;
+		$item->slug			= $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+		$item->catslug		= $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
 		$item->parent_slug	= $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 		// No link for ROOT category
@@ -75,7 +76,7 @@ public function display($tpl = null)
 		// Otherwise, article params override menu item params
 		$this->params = $this->state->get('params');
 		$active = $app->getMenu()->getActive();
-		$temp = clone ($this->params);
+		$temp = clone $this->params;
 
 		// Check to see which parameters should take priority
 		if ($active)
@@ -83,7 +84,7 @@ public function display($tpl = null)
 			$currentLink = $active->link;
 
 			// If the current view is the active item and an article view for this article, then the menu item params take priority
-			if (strpos($currentLink, 'view=article') && (strpos($currentLink, '&id='.(string) $item->id)))
+			if (strpos($currentLink, 'view=article') && (strpos($currentLink, '&id=' . (string) $item->id)))
 			{
 				// Load layout from active query (in case it is an alternative menu item)
 				if (isset($active->query['layout']))
@@ -135,6 +136,7 @@ public function display($tpl = null)
 		if ($item->params->get('access-view') == false && ($item->params->get('show_noauth', '0') == '0'))
 		{
 			JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR'));
+
 			return;
 		}
 
@@ -176,7 +178,7 @@ public function display($tpl = null)
 			$model->hit();
 		}
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($this->item->params->get('pageclass_sfx'));
 
 		$this->_prepareDocument();
@@ -185,7 +187,9 @@ public function display($tpl = null)
 	}
 
 	/**
-	 * Prepares the document
+	 * Prepares the document.
+	 *
+	 * @return  void.
 	 */
 	protected function _prepareDocument()
 	{
@@ -211,7 +215,7 @@ protected function _prepareDocument()
 
 		$id = (int) @$menu->query['id'];
 
-		// if the menu item does not concern this article
+		// If the menu item does not concern this article
 		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] != 'article' || $id != $this->item->id))
 		{
 			// If this is not a single article menu item, set the page title to the article title
@@ -219,6 +223,7 @@ protected function _prepareDocument()
 			{
 				$title = $this->item->title;
 			}
+
 			$path = array(array('title' => $this->item->title, 'link' => ''));
 			$category = JCategories::getInstance('Content')->get($this->item->catid);
 
@@ -227,6 +232,7 @@ protected function _prepareDocument()
 				$path[] = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
 			}
+
 			$path = array_reverse($path);
 
 			foreach ($path as $item)
@@ -253,6 +259,7 @@ protected function _prepareDocument()
 		{
 			$title = $this->item->title;
 		}
+
 		$this->document->setTitle($title);
 
 		if ($this->item->metadesc)
@@ -297,7 +304,9 @@ protected function _prepareDocument()
 		if (!empty($this->item->page_title))
 		{
 			$this->item->title = $this->item->title . ' - ' . $this->item->page_title;
-			$this->document->setTitle($this->item->page_title . ' - ' . JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $this->state->get('list.offset') + 1));
+			$this->document->setTitle(
+				$this->item->page_title . ' - ' . JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $this->state->get('list.offset') + 1)
+			);
 		}
 
 		if ($this->print)
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 31b61cffb9b1c..542b8638af327 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -91,7 +91,7 @@ public function display($tpl = null)
 				$item->parent_slug = null;
 			}
 
-			$item->catslug = $item->category_alias ? ($item->catid.':'.$item->category_alias) : $item->catid;
+			$item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
 			$item->event   = new stdClass;
 
 			$dispatcher = JEventDispatcher::getInstance();
@@ -145,8 +145,6 @@ public function display($tpl = null)
 		// This makes it much easier for the designer to just interrogate the arrays.
 		if (($params->get('layout_type') == 'blog') || ($this->getLayout() == 'blog'))
 		{
-			//$max = count($this->items);
-
 			foreach ($this->items as $i => $item)
 			{
 				if ($i < $numLeading)
@@ -175,7 +173,7 @@ public function display($tpl = null)
 
 			if ($order == 0 && $this->columns > 1)
 			{
-				// call order down helper
+				// Call order down helper
 				$this->intro_items = ContentHelperQuery::orderDownColumns($this->intro_items, $this->columns);
 			}
 		}
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index a132d16fc896f..73b330a70236a 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -39,9 +39,10 @@ public function display($tpl = null)
 		$app->input->set('limit', $app->get('feed_limit'));
 		$categories = JCategories::getInstance('Content');
 		$rows       = $this->get('Items');
+
 		foreach ($rows as $row)
 		{
-			// strip html from feed item title
+			// Strip html from feed item title
 			$title = $this->escape($row->title);
 			$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
 
@@ -60,7 +61,7 @@ public function display($tpl = null)
 			$db->setQuery($query);
 			$row->fulltext = $db->loadResult();
 
-			$description	= ($params->get('feed_summary', 0) ? $row->introtext.$row->fulltext : $row->introtext);
+			$description	= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
 			$author			= $row->created_by_alias ? $row->created_by_alias : $row->author;
 
 			// Load individual item creator class
@@ -69,7 +70,9 @@ public function display($tpl = null)
 			$item->link			= $link;
 			$item->date			= $row->publish_up;
 			$item->category		= array();
-			$item->category[]	= JText::_('JFEATURED'); // All featured articles are categorized as "Featured"
+
+			// All featured articles are categorized as "Featured"
+			$item->category[]	= JText::_('JFEATURED');
 
 			for ($item_category = $categories->get($row->catid); $item_category !== null; $item_category = $item_category->getParent())
 			{
@@ -98,7 +101,7 @@ public function display($tpl = null)
 			}
 
 			// Load item description and add div
-			$item->description	= '<div class="feed-description">'.$description.'</div>';
+			$item->description = '<div class="feed-description">' . $description . '</div>';
 
 			// Loads item info into rss array
 			$doc->addItem($item);
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index 28e16ee82aff1..1fa0a9b0ee3a3 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -53,6 +53,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -87,6 +88,7 @@ public function display($tpl = null)
 			{
 				$item->text = $item->introtext;
 			}
+
 			JPluginHelper::importPlugin('content');
 			$dispatcher->trigger('onContentPrepare', array ('com_content.featured', &$item, &$item->params, 0));
 
@@ -109,6 +111,7 @@ public function display($tpl = null)
 
 		// The first group is the leading articles.
 		$limit = $numLeading;
+
 		for ($i = 0; $i < $limit && $i < $max; $i++)
 		{
 			$this->lead_items[$i] = &$items[$i];
@@ -116,6 +119,7 @@ public function display($tpl = null)
 
 		// The second group is the intro articles.
 		$limit = $numLeading + $numIntro;
+
 		// Order articles across, then down (or single column mode)
 		for ($i = $numLeading; $i < $limit && $i < $max; $i++)
 		{
@@ -127,7 +131,7 @@ public function display($tpl = null)
 
 		if ($order == 0 && $this->columns > 1)
 		{
-			// call order down helper
+			// Call order down helper
 			$this->intro_items = ContentHelperQuery::orderDownColumns($this->intro_items, $this->columns);
 		}
 
@@ -137,7 +141,7 @@ public function display($tpl = null)
 			$this->link_items[$i] = &$items[$i];
 		}
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
 		$this->params     = &$params;
@@ -151,7 +155,9 @@ public function display($tpl = null)
 	}
 
 	/**
-	 * Prepares the document
+	 * Prepares the document.
+	 *
+	 * @return  void.
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index 1a229add87ad9..35cbe877871f6 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -55,6 +55,7 @@ public function display($tpl = null)
 		if ($authorised !== true)
 		{
 			JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR'));
+
 			return false;
 		}
 
@@ -80,13 +81,14 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
+
 			return false;
 		}
 
 		// Create a shortcut to the parameters.
 		$params	= &$this->state->params;
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
 		$this->params = $params;
@@ -107,6 +109,8 @@ public function display($tpl = null)
 
 	/**
 	 * Prepares the document
+	 *
+	 * @return  void.
 	 */
 	protected function _prepareDocument()
 	{
diff --git a/components/com_mailto/controller.php b/components/com_mailto/controller.php
index fc7e6840a75f0..13e334bac1605 100644
--- a/components/com_mailto/controller.php
+++ b/components/com_mailto/controller.php
@@ -17,9 +17,9 @@
 class MailtoController extends JControllerLegacy
 {
 	/**
-	 * Show the form so that the user can send the link to someone
+	 * Show the form so that the user can send the link to someone.
 	 *
-	 * @access public
+	 * @return  void
 	 *
 	 * @since 1.5
 	 */
@@ -34,8 +34,9 @@ public function mailto()
 	/**
 	 * Send the message and display a notice
 	 *
-	 * @access public
-	 * @since 1.5
+	 * @return  void
+	 *
+	 * @since  1.5
 	 */
 	public function send()
 	{
@@ -111,6 +112,7 @@ public function send()
 
 		// Check for a valid to address
 		$error = false;
+
 		if (! $email  || ! JMailHelper::isEmailAddress($email))
 		{
 			$error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $email);
diff --git a/components/com_mailto/helpers/mailto.php b/components/com_mailto/helpers/mailto.php
index 1aa34878b0d4a..ac6eead5f3bd2 100644
--- a/components/com_mailto/helpers/mailto.php
+++ b/components/com_mailto/helpers/mailto.php
@@ -18,7 +18,8 @@ abstract class MailtoHelper
 	/**
 	 * Adds a URL to the mailto system and returns the hash
 	 *
-	 * @param string url
+	 * @param   string  $url  Url
+	 *
 	 * @return URL hash
 	 */
 	public static function addLink($url)
@@ -27,20 +28,24 @@ public static function addLink($url)
 		self::cleanHashes();
 		$session = JFactory::getSession();
 		$mailto_links = $session->get('com_mailto.links', array());
+
 		if (!isset($mailto_links[$hash]))
 		{
 			$mailto_links[$hash] = new stdClass;
 		}
+
 		$mailto_links[$hash]->link = $url;
 		$mailto_links[$hash]->expiry = time();
 		$session->set('com_mailto.links', $mailto_links);
+
 		return $hash;
 	}
 
 	/**
 	 * Checks if a URL is a Flash file
 	 *
-	 * @param string
+	 * @param   string  $hash  File hash
+	 *
 	 * @return URL
 	 */
 	public static function validateHash($hash)
@@ -49,27 +54,35 @@ public static function validateHash($hash)
 		$session = JFactory::getSession();
 		self::cleanHashes();
 		$mailto_links = $session->get('com_mailto.links', array());
+
 		if (isset($mailto_links[$hash]))
 		{
 			$retval = $mailto_links[$hash]->link;
 		}
+
 		return $retval;
 	}
 
 	/**
 	 * Cleans out old hashes
 	 *
+	 * @param   integer  $lifetime  How old are the hashes we want to remove
+	 *
+	 * @return  void
+	 *
 	 * @since 1.6.1
 	 */
 	public static function cleanHashes($lifetime = 1440)
 	{
-		// flag for if we've cleaned on this cycle
+		// Flag for if we've cleaned on this cycle
 		static $cleaned = false;
+
 		if (!$cleaned)
 		{
 			$past = time() - $lifetime;
 			$session = JFactory::getSession();
 			$mailto_links = $session->get('com_mailto.links', array());
+
 			foreach ($mailto_links as $index => $link)
 			{
 				if ($link->expiry < $past)
@@ -77,6 +90,7 @@ public static function cleanHashes($lifetime = 1440)
 					unset($mailto_links[$index]);
 				}
 			}
+
 			$session->set('com_mailto.links', $mailto_links);
 			$cleaned = true;
 		}
diff --git a/components/com_mailto/mailto.php b/components/com_mailto/mailto.php
index 08b8c040403c0..a182e788ccd2a 100644
--- a/components/com_mailto/mailto.php
+++ b/components/com_mailto/mailto.php
@@ -9,11 +9,9 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT.'/helpers/mailto.php';
-require_once JPATH_COMPONENT.'/controller.php';
+require_once JPATH_COMPONENT . '/helpers/mailto.php';
+require_once JPATH_COMPONENT . '/controller.php';
 
 $controller = JControllerLegacy::getInstance('Mailto');
 $controller->registerDefaultTask('mailto');
 $controller->execute(JFactory::getApplication()->input->get('task'));
-
-//$controller->redirect();
diff --git a/components/com_mailto/views/mailto/view.html.php b/components/com_mailto/views/mailto/view.html.php
index ff0d2920c1d01..8c870f3c7d510 100644
--- a/components/com_mailto/views/mailto/view.html.php
+++ b/components/com_mailto/views/mailto/view.html.php
@@ -17,11 +17,18 @@
 class MailtoViewMailto extends JViewLegacy
 {
 	/**
-	 * @since  1.5
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
+	 *
+	 * @since   1.5
 	 */
 	public function display($tpl = null)
 	{
 		$data = $this->getData();
+
 		if ($data === false)
 		{
 			return false;
@@ -29,13 +36,17 @@ public function display($tpl = null)
 
 		$this->set('data', $data);
 
-		parent::display($tpl);
+		return parent::display($tpl);
 	}
 
 	/**
+	 * Get the form data
+	 *
+	 * @return  object
+	 *
 	 * @since  1.5
 	 */
-	function &getData()
+	protected function &getData()
 	{
 		$user = JFactory::getUser();
 		$app  = JFactory::getApplication();
@@ -48,8 +59,8 @@ function &getData()
 		if ($data->link == '')
 		{
 			JError::raiseError(403, JText::_('COM_MAILTO_LINK_IS_MISSING'));
-			$false = false;
-			return $false;
+
+			return false;
 		}
 
 		// Load with previous data, if it exists
diff --git a/components/com_mailto/views/sent/view.html.php b/components/com_mailto/views/sent/view.html.php
index c8a5d15bad41b..efb70a1405011 100644
--- a/components/com_mailto/views/sent/view.html.php
+++ b/components/com_mailto/views/sent/view.html.php
@@ -16,11 +16,4 @@
  */
 class MailtoViewSent extends JViewLegacy
 {
-	/**
-	 * @since  1.5
-	 */
-	public function display($tpl = null)
-	{
-		parent::display($tpl);
-	}
 }
diff --git a/components/com_newsfeeds/controller.php b/components/com_newsfeeds/controller.php
index 5122bca72942f..bcdbf0dad10b3 100644
--- a/components/com_newsfeeds/controller.php
+++ b/components/com_newsfeeds/controller.php
@@ -21,10 +21,11 @@ class NewsfeedsController extends JControllerLegacy
 	/**
 	 * Method to show a newsfeeds view
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController		This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
@@ -42,7 +43,8 @@ public function display($cachable = false, $urlparams = false)
 			$cachable = false;
 		}
 
-		$safeurlparams = array('id' => 'INT', 'limit' => 'UINT', 'limitstart' => 'UINT', 'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'lang' => 'CMD');
+		$safeurlparams = array('id' => 'INT', 'limit' => 'UINT', 'limitstart' => 'UINT',
+								'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'lang' => 'CMD');
 
 		parent::display($cachable, $safeurlparams);
 	}
diff --git a/components/com_newsfeeds/helpers/association.php b/components/com_newsfeeds/helpers/association.php
index a3965ad3a8379..6792ba0a0c23d 100644
--- a/components/com_newsfeeds/helpers/association.php
+++ b/components/com_newsfeeds/helpers/association.php
@@ -64,6 +64,5 @@ public static function getAssociations($id = 0, $view = null)
 		}
 
 		return array();
-
 	}
 }
diff --git a/components/com_newsfeeds/helpers/category.php b/components/com_newsfeeds/helpers/category.php
index f4cb6ee12ad00..e856c71299509 100644
--- a/components/com_newsfeeds/helpers/category.php
+++ b/components/com_newsfeeds/helpers/category.php
@@ -18,6 +18,11 @@
  */
 class NewsfeedsCategories extends JCategories
 {
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  options
+	 */
 	public function __construct($options = array())
 	{
 		$options['table'] = '#__newsfeeds';
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index e4da2cff9f0eb..9b83f0b42ef96 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -23,7 +23,13 @@ abstract class NewsfeedsHelperRoute
 	protected static $lang_lookup = array();
 
 	/**
-	 * @param   integer  The route of the newsfeed
+	 * getNewsfeedRoute
+	 *
+	 * @param   int  $id        menu itemid
+	 * @param   int  $catid     category id
+	 * @param   int  $language  language
+	 *
+	 * @return string
 	 */
 	public static function getNewsfeedRoute($id, $catid, $language = 0)
 	{
@@ -31,8 +37,8 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
 			'newsfeed'  => array((int) $id)
 		);
 
-		//Create the link
-		$link = 'index.php?option=com_newsfeeds&view=newsfeed&id='. $id;
+		// Create the link
+		$link = 'index.php?option=com_newsfeeds&view=newsfeed&id=' . $id;
 
 		if ((int) $catid > 1)
 		{
@@ -41,10 +47,10 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
 
 			if ($category)
 			{
-				//TODO Throw error that the category either not exists or is unpublished
+				// TODO Throw error that the category either not exists or is unpublished
 				$needles['category'] = array_reverse($category->getPath());
 				$needles['categories'] = $needles['category'];
-				$link .= '&catid='.$catid;
+				$link .= '&catid=' . $catid;
 			}
 		}
 
@@ -61,12 +67,20 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
 
 		if ($item = self::_findItem($needles))
 		{
-			$link .= '&Itemid='.$item;
+			$link .= '&Itemid=' . $item;
 		}
 
 		return $link;
 	}
 
+	/**
+	 * getCategoryRoute
+	 *
+	 * @param   int  $catid     category id
+	 * @param   int  $language  language
+	 *
+	 * @return string
+	 */
 	public static function getCategoryRoute($catid, $language = 0)
 	{
 		if ($catid instanceof JCategoryNode)
@@ -89,7 +103,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles = array();
 
 			// Create the link
-			$link = 'index.php?option=com_newsfeeds&view=category&id='.$id;
+			$link = 'index.php?option=com_newsfeeds&view=category&id=' . $id;
 
 			$catids = array_reverse($category->getPath());
 			$needles['category'] = $catids;
@@ -108,13 +122,21 @@ public static function getCategoryRoute($catid, $language = 0)
 
 			if ($item = self::_findItem($needles))
 			{
-				$link .= '&Itemid='.$item;
+				$link .= '&Itemid=' . $item;
 			}
 		}
 
 		return $link;
 	}
 
+	/**
+	 * buildLanguageLookup
+	 *
+	 * @return  void
+	 *
+	 * @throws Exception
+	 */
+
 	protected static function buildLanguageLookup()
 	{
 		if (count(self::$lang_lookup) == 0)
@@ -135,6 +157,15 @@ protected static function buildLanguageLookup()
 		}
 	}
 
+	/**
+	 * finditem
+	 *
+	 * @param   null  $needles  what we are searching for
+	 *
+	 * @return  int  menu itemid
+	 *
+	 * @throws Exception
+	 */
 	protected static function _findItem($needles = null)
 	{
 		$app		= JFactory::getApplication();
@@ -164,16 +195,17 @@ protected static function _findItem($needles = null)
 				if (isset($item->query) && isset($item->query['view']))
 				{
 					$view = $item->query['view'];
-				if (!isset(self::$lookup[$language][$view]))
+
+					if (!isset(self::$lookup[$language][$view]))
 					{
 						self::$lookup[$language][$view] = array();
 					}
+
 					if (isset($item->query['id']))
 					{
-
-						// here it will become a bit tricky
-						// language != * can override existing entries
-						// language == * cannot override existing entries
+						/* Here it will become a bit tricky
+						 language != * can override existing entries
+						 language == * cannot override existing entries */
 						if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
@@ -202,6 +234,7 @@ protected static function _findItem($needles = null)
 
 		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
+
 		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
@@ -209,6 +242,7 @@ protected static function _findItem($needles = null)
 
 		// If not found, return language specific home link
 		$default = $menus->getDefault($language);
+
 		return !empty($default->id) ? $default->id : null;
 	}
 }
diff --git a/components/com_newsfeeds/models/categories.php b/components/com_newsfeeds/models/categories.php
index 605cbacc9c861..260524d2095f6 100644
--- a/components/com_newsfeeds/models/categories.php
+++ b/components/com_newsfeeds/models/categories.php
@@ -41,8 +41,16 @@ class NewsfeedsModelCategories extends JModelList
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field
+	 * @param   string  $direction  An optional direction [asc|desc]
+	 *
+	 * @return void
+	 *
+	 * @throws Exception
+	 *
 	 * @since   1.6
 	 */
+
 	protected function populateState($ordering = null, $direction = null)
 	{
 		$app = JFactory::getApplication();
@@ -66,17 +74,17 @@ protected function populateState($ordering = null, $direction = null)
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id	A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
 	 * @return  string  A store id.
 	 */
 	protected function getStoreId($id = '')
 	{
 		// Compile the store id.
-		$id	.= ':'.$this->getState('filter.extension');
-		$id	.= ':'.$this->getState('filter.published');
-		$id	.= ':'.$this->getState('filter.access');
-		$id	.= ':'.$this->getState('filter.parentId');
+		$id .= ':' . $this->getState('filter.extension');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.parentId');
 
 		return parent::getStoreId($id);
 	}
@@ -94,18 +102,23 @@ public function getItems()
 			$menu = $app->getMenu();
 			$active = $menu->getActive();
 			$params = new JRegistry;
+
 			if ($active)
 			{
 				$params->loadString($active->params);
 			}
+
 			$options = array();
 			$options['countItems'] = $params->get('show_cat_items_cat', 1) || !$params->get('show_empty_categories_cat', 0);
 			$categories = JCategories::getInstance('Newsfeeds', $options);
 			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
 			if (is_object($this->_parent))
 			{
 				$this->_items = $this->_parent->getChildren();
-			} else {
+			}
+			else
+			{
 				$this->_items = false;
 			}
 		}
@@ -113,12 +126,18 @@ public function getItems()
 		return $this->_items;
 	}
 
+	/**
+	 * get the Parent
+	 *
+	 * @return null
+	 */
 	public function getParent()
 	{
 		if (!is_object($this->_parent))
 		{
 			$this->getItems();
 		}
+
 		return $this->_parent;
 	}
 }
diff --git a/components/com_newsfeeds/models/category.php b/components/com_newsfeeds/models/category.php
index a929635de9b33..8b585f4c88767 100644
--- a/components/com_newsfeeds/models/category.php
+++ b/components/com_newsfeeds/models/category.php
@@ -52,7 +52,8 @@ class NewsfeedsModelCategory extends JModelList
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -104,6 +105,7 @@ public function getItems()
 	 * Method to build an SQL query to load the list data.
 	 *
 	 * @return  string    An SQL query
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -130,6 +132,7 @@ protected function getListQuery()
 
 		// Filter by state
 		$state = $this->getState('filter.published');
+
 		if (is_numeric($state))
 		{
 			$query->where('a.published = ' . (int) $state);
@@ -148,6 +151,7 @@ protected function getListQuery()
 
 		// Filter by search in title
 		$search = $this->getState('list.filter');
+
 		if (!empty($search))
 		{
 			$search = $db->quote('%' . $db->escape($search, true) . '%');
@@ -171,7 +175,14 @@ protected function getListQuery()
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field
+	 * @param   string  $direction  An optional direction [asc|desc]
+	 *
+	 * @return void
+	 *
 	 * @since   1.6
+	 *
+	 * @throws Exception
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
@@ -189,26 +200,31 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('list.filter', $app->input->getString('filter-search'));
 
 		$orderCol = $app->input->get('filter_order', 'ordering');
+
 		if (!in_array($orderCol, $this->filter_fields))
 		{
 			$orderCol = 'ordering';
 		}
+
 		$this->setState('list.ordering', $orderCol);
 
 		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
 		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
 		{
 			$listOrder = 'ASC';
 		}
+
 		$this->setState('list.direction', $listOrder);
 
 		$id = $app->input->get('id', 0, 'int');
 		$this->setState('category.id', $id);
 
 		$user = JFactory::getUser();
+
 		if ((!$user->authorise('core.edit.state', 'com_newsfeeds')) && (!$user->authorise('core.edit', 'com_newsfeeds')))
 		{
-			// limit to published for people who can't edit or edit.state.
+			// Limit to published for people who can't edit or edit.state.
 			$this->setState('filter.published', 1);
 
 			// Filter by start and end dates.
@@ -224,9 +240,8 @@ protected function populateState($ordering = null, $direction = null)
 	/**
 	 * Method to get category data for the current category
 	 *
-	 * @param   integer  An optional ID
-	 *
 	 * @return  object
+	 *
 	 * @since   1.5
 	 */
 	public function getCategory()
@@ -247,14 +262,17 @@ public function getCategory()
 			$options['countItems'] = $params->get('show_cat_items', 1) || $params->get('show_empty_categories', 0);
 			$categories = JCategories::getInstance('Newsfeeds', $options);
 			$this->_item = $categories->get($this->getState('category.id', 'root'));
+
 			if (is_object($this->_item))
 			{
 				$this->_children = $this->_item->getChildren();
 				$this->_parent = false;
+
 				if ($this->_item->getParent())
 				{
 					$this->_parent = $this->_item->getParent();
 				}
+
 				$this->_rightsibling = $this->_item->getSibling();
 				$this->_leftsibling = $this->_item->getSibling(false);
 			}
@@ -271,8 +289,6 @@ public function getCategory()
 	/**
 	 * Get the parent category.
 	 *
-	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
-	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
 	 */
 	public function getParent()
@@ -281,6 +297,7 @@ public function getParent()
 		{
 			$this->getCategory();
 		}
+
 		return $this->_parent;
 	}
 
@@ -289,32 +306,37 @@ public function getParent()
 	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
 	 */
-	function &getLeftSibling()
+	public function &getLeftSibling()
 	{
 		if (!is_object($this->_item))
 		{
 			$this->getCategory();
 		}
+
 		return $this->_leftsibling;
 	}
 
-	function &getRightSibling()
+	/**
+	 * Get the sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getRightSibling()
 	{
 		if (!is_object($this->_item))
 		{
 			$this->getCategory();
 		}
+
 		return $this->_rightsibling;
 	}
 
 	/**
 	 * Get the child categories.
 	 *
-	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
-	 *
 	 * @return  mixed  An array of categories or false if an error occurs.
 	 */
-	function &getChildren()
+	public function &getChildren()
 	{
 		if (!is_object($this->_item))
 		{
diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php
index 98812f7707891..4088cf9fa5f83 100644
--- a/components/com_newsfeeds/models/newsfeed.php
+++ b/components/com_newsfeeds/models/newsfeed.php
@@ -32,6 +32,7 @@ class NewsfeedsModelNewsfeed extends JModelItem
 	 * Note. Calling getState in this method will result in recursion.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState()
@@ -50,7 +51,9 @@ protected function populateState()
 		$this->setState('params', $params);
 
 		$user = JFactory::getUser();
-		if ((!$user->authorise('core.edit.state', 'com_newsfeeds')) &&  (!$user->authorise('core.edit', 'com_newsfeeds'))){
+
+		if ((!$user->authorise('core.edit.state', 'com_newsfeeds')) && (!$user->authorise('core.edit', 'com_newsfeeds')))
+		{
 			$this->setState('filter.published', 1);
 			$this->setState('filter.archived', 2);
 		}
@@ -59,9 +62,10 @@ protected function populateState()
 	/**
 	 * Method to get newsfeed data.
 	 *
-	 * @param   integer	The id of the newsfeed.
+	 * @param   integer  $pk  The id of the newsfeed.
 	 *
 	 * @return  mixed  Menu item data object on success, false on failure.
+	 *
 	 * @since   1.6
 	 */
 	public function &getItem($pk = null)
@@ -103,6 +107,7 @@ public function &getItem($pk = null)
 				// Filter by published state.
 				$published = $this->getState('filter.published');
 				$archived = $this->getState('filter.archived');
+
 				if (is_numeric($published))
 				{
 					$query->where('(a.published = ' . (int) $published . ' OR a.published =' . (int) $archived . ')')
@@ -121,6 +126,7 @@ public function &getItem($pk = null)
 				}
 
 				// Check for published state if filter set.
+
 				if (((is_numeric($published)) || (is_numeric($archived))) && (($data->published != $published) && ($data->published != $archived)))
 				{
 					JError::raiseError(404, JText::_('COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND'));
@@ -137,14 +143,16 @@ public function &getItem($pk = null)
 				$data->metadata = $registry;
 
 				// Compute access permissions.
+
 				if ($access = $this->getState('filter.access'))
 				{
 					// If the access filter has been set, we already know this user can view.
 					$data->params->set('access-view', true);
 				}
-				else {
+				else
+				{
 					// If no access filter is set, the layout takes some responsibility for display of limited information.
-					$user = JFactory::getUser();
+					$user   = JFactory::getUser();
 					$groups = $user->getAuthorisedViewLevels();
 					$data->params->set('access-view', in_array($data->access, $groups) && in_array($data->category_access, $groups));
 				}
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index 4d1cc64c616ea..85b5c7b03f2d2 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -231,7 +231,7 @@ public function parse(&$segments)
 						->select($db->quoteName('id'))
 						->from('#__newsfeeds')
 						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
-						->where($db->quoteName('alias') . ' = ' . $db->quote($db->quote($segment)));
+						->where($db->quoteName('alias') . ' = ' . $db->quote($segment));
 					$db->setQuery($query);
 					$nid = $db->loadResult();
 				}
@@ -252,21 +252,34 @@ public function parse(&$segments)
 }
 
 /**
- * Newsfeeds router functions
+ * newsfeedsBuildRoute
  *
  * These functions are proxys for the new router interface
  * for old SEF extensions.
  *
+ * @param   array  &$query  The segments of the URL to parse.
+ *
+ * @return array
+ *
  * @deprecated  4.0  Use Class based routers instead
  */
-function NewsfeedsBuildRoute(&$query)
+function newsfeedsBuildRoute(&$query)
 {
 	$router = new NewsfeedsRouter;
 
 	return $router->build($query);
 }
 
-function NewsfeedsParseRoute($segments)
+/**
+ * newsfeedsParseRoute
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function newsfeedsParseRoute($segments)
 {
 	$router = new NewsfeedsRouter;
 
diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php
index fa6e2515ea919..f97fc0a64f2c8 100644
--- a/components/com_newsfeeds/views/category/view.html.php
+++ b/components/com_newsfeeds/views/category/view.html.php
@@ -51,10 +51,10 @@ public function display($tpl = null)
 		// Compute the newsfeed slug.
 		foreach ($this->items as $item)
 		{
-			$item->slug	= $item->alias ? ($item->id.':'.$item->alias) : $item->id;
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
 			$temp		= new JRegistry;
 			$temp->loadString($item->params);
-			$item->params = clone($this->params);
+			$item->params = clone $this->params;
 			$item->params->merge($temp);
 		}
 
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index afe2de65f3f2f..0198d7743f96b 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -8,16 +8,15 @@
  */
 
 defined('_JEXEC') or die;
-?>
-<?php
+
 if (!empty($this->msg))
 {
 	echo $this->msg;
 }
 else
 {
-	$lang = JFactory::getLanguage();
-	$myrtl = $this->newsfeed->rtl;
+	$lang      = JFactory::getLanguage();
+	$myrtl     = $this->newsfeed->rtl;
 	$direction = " ";
 
 		if ($lang->isRTL() && $myrtl == 0)
@@ -26,7 +25,7 @@
 		}
 		elseif ($lang->isRTL() && $myrtl == 1)
 		{
-				$direction = " redirect-ltr";
+			$direction = " redirect-ltr";
 		}
 		elseif ($lang->isRTL() && $myrtl == 2)
 		{
@@ -44,7 +43,7 @@
 		{
 			$direction = " redirect-rtl";
 		}
-		$images  = json_decode($this->item->images);
+		$images = json_decode($this->item->images);
 	?>
 	<div class="newsfeed<?php echo $this->pageclass_sfx?><?php echo $direction; ?>">
 	<?php if ($this->params->get('display_num')) :  ?>
@@ -84,7 +83,7 @@
 	src="<?php echo htmlspecialchars($images->image_second); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt); ?>"/> </div>
 	<?php endif; ?>
 	<!-- Show Description from Component -->
-<?php echo $this->item->description; ?>
+	<?php echo $this->item->description; ?>
 	<!-- Show Feed's Description -->
 
 	<?php if ($this->params->get('show_feed_description')) : ?>
@@ -104,7 +103,7 @@
 	<?php if (!empty($this->rssDoc[0])) { ?>
 	<ol>
 		<?php for ($i = 0; $i < $this->item->numarticles; $i++) { ?>
-
+	<?php if (empty($this->rssDoc[$i])) { break; } ?>
 	<?php
 		$uri = !empty($this->rssDoc[$i]->guid) || !is_null($this->rssDoc[$i]->guid) ? $this->rssDoc[$i]->guid : $this->rssDoc[$i]->uri;
 		$uri = substr($uri, 0, 4) != 'http' ? $this->item->link : $uri;
@@ -126,7 +125,6 @@
 					$text = JHtml::_('string.truncate', $text, $this->params->get('feed_character_count'));
 						echo str_replace('&apos;', "'", $text);
 					?>
-
 					</div>
 				<?php endif; ?>
 				</li>
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index eac3fd48e758b..fe2483c69bc75 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -83,12 +83,13 @@ public function display($tpl = null)
 		$item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
 		$item->parent_slug = $item->category_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
-		// check if cache directory is writeable
+		// Check if cache directory is writeable
 		$cacheDir = JPATH_CACHE . '/';
 
 		if (!is_writable($cacheDir))
 		{
 			JError::raiseNotice('0', JText::_('COM_NEWSFEEDS_CACHE_DIRECTORY_UNWRITABLE'));
+
 			return;
 		}
 
@@ -97,7 +98,7 @@ public function display($tpl = null)
 		$params = $state->get('params');
 		$newsfeed_params = clone $item->params;
 		$active = $app->getMenu()->getActive();
-		$temp = clone ($params);
+		$temp = clone $params;
 
 		// Check to see which parameters should take priority
 		if ($active)
@@ -105,7 +106,7 @@ public function display($tpl = null)
 			$currentLink = $active->link;
 
 			// If the current view is the active item and an newsfeed view for this feed, then the menu item params take priority
-			if (strpos($currentLink, 'view=newsfeed') && (strpos($currentLink, '&id='.(string) $item->id)))
+			if (strpos($currentLink, 'view=newsfeed') && (strpos($currentLink, '&id=' . (string) $item->id)))
 			{
 				// $item->params are the newsfeed params, $temp are the menu item params
 				// Merge so that the menu item params take priority
@@ -151,6 +152,7 @@ public function display($tpl = null)
 		if (!in_array($item->access, $levels) or ((in_array($item->access, $levels) and (!in_array($item->category_access, $levels)))))
 		{
 			JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR'));
+
 			return;
 		}
 
@@ -183,12 +185,13 @@ public function display($tpl = null)
 		}
 
 		$feed_display_order = $params->get('feed_display_order', 'des');
+
 		if ($feed_display_order == 'asc')
 		{
 			$newsfeed->items = array_reverse($newsfeed->items);
 		}
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
 		$this->assignRef('params', $params);
@@ -196,10 +199,12 @@ public function display($tpl = null)
 		$this->assignRef('state', $state);
 		$this->assignRef('item', $item);
 		$this->assignRef('user', $user);
+
 		if (!empty($msg))
 		{
 			$this->assignRef('msg', $msg);
 		}
+
 		$this->print = $print;
 
 		$item->tags = new JHelperTags;
@@ -218,6 +223,7 @@ public function display($tpl = null)
 	 * Prepares the document
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function _prepareDocument()
@@ -244,7 +250,7 @@ protected function _prepareDocument()
 
 		$id = (int) @$menu->query['id'];
 
-		// if the menu item does not concern this newsfeed
+		// If the menu item does not concern this newsfeed
 		if ($menu && ($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] != 'newsfeed' || $id != $this->item->id))
 		{
 			// If this is not a single newsfeed menu item, set the page title to the newsfeed title
@@ -255,12 +261,15 @@ protected function _prepareDocument()
 
 			$path = array(array('title' => $this->item->name, 'link' => ''));
 			$category = JCategories::getInstance('Newsfeeds')->get($this->item->catid);
+
 			while (($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
 			}
+
 			$path = array_reverse($path);
+
 			foreach ($path as $item)
 			{
 				$pathway->addItem($item['title'], $item['link']);
@@ -279,10 +288,12 @@ protected function _prepareDocument()
 		{
 			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
 		}
+
 		if (empty($title))
 		{
 			$title = $this->item->name;
 		}
+
 		$this->document->setTitle($title);
 
 		if ($this->item->metadesc)
@@ -319,6 +330,7 @@ protected function _prepareDocument()
 		}
 
 		$mdata = $this->item->metadata->toArray();
+
 		foreach ($mdata as $k => $v)
 		{
 			if ($v)
diff --git a/components/com_search/controller.php b/components/com_search/controller.php
index 69f6d08111a19..3e5e2b2e460b3 100644
--- a/components/com_search/controller.php
+++ b/components/com_search/controller.php
@@ -21,25 +21,35 @@ class SearchController extends JControllerLegacy
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   bool  $cachable   If true, the view output will be cached
+	 * @param   bool  $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy This object to support chaining.
 	 *
-	 * @return  JController		This object to support chaining.
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		$this->input->set('view', 'search'); // force it to be the search view
+		// Force it to be the search view
+		$this->input->set('view', 'search');
 
 		return parent::display($cachable, $urlparams);
 	}
 
+	/**
+	 * Search
+	 *
+	 * @return void
+	 *
+	 * @throws Exception
+	 */
 	public function search()
 	{
-		// slashes cause errors, <> get stripped anyway later on. # causes problems.
+		// Slashes cause errors, <> get stripped anyway later on. # causes problems.
 		$badchars = array('#', '>', '<', '\\');
 		$searchword = trim(str_replace($badchars, '', $this->input->getString('searchword', null, 'post')));
-		// if searchword enclosed in double quotes, strip quotes and do exact match
+
+		// If searchword enclosed in double quotes, strip quotes and do exact match
 		if (substr($searchword, 0, 1) == '"' && substr($searchword, -1) == '"')
 		{
 			$post['searchword'] = substr($searchword, 1, -1);
@@ -49,6 +59,7 @@ public function search()
 		{
 			$post['searchword'] = $searchword;
 		}
+
 		$post['ordering']     = $this->input->getWord('ordering', null, 'post');
 		$post['searchphrase'] = $this->input->getWord('searchphrase', 'all', 'post');
 		$post['limit']        = $this->input->getUInt('limit', null, 'post');
@@ -59,6 +70,7 @@ public function search()
 		}
 
 		$areas = $this->input->post->get('areas', null, 'array');
+
 		if ($areas)
 		{
 			foreach ($areas as $area)
@@ -95,6 +107,6 @@ public function search()
 		$uri->setQuery($post);
 		$uri->setVar('option', 'com_search');
 
-		$this->setRedirect(JRoute::_('index.php'.$uri->toString(array('query', 'fragment')), false));
+		$this->setRedirect(JRoute::_('index.php' . $uri->toString(array('query', 'fragment')), false));
 	}
 }
diff --git a/components/com_search/models/search.php b/components/com_search/models/search.php
index 32b85b877e010..bfe41ea2fd835 100644
--- a/components/com_search/models/search.php
+++ b/components/com_search/models/search.php
@@ -55,7 +55,7 @@ public function __construct()
 	{
 		parent::__construct();
 
-		//Get configuration
+		// Get configuration
 		$app    = JFactory::getApplication();
 		$config = JFactory::getConfig();
 
@@ -85,7 +85,7 @@ public function __construct()
 		$ordering = $app->input->get('ordering', $params->get('ordering', 'newest'), 'word');
 		$this->setSearch($keyword, $match, $ordering);
 
-		//Set the search areas
+		// Set the search areas
 		$areas = $app->input->get('areas', null, 'array');
 		$this->setAreas($areas);
 	}
@@ -93,10 +93,13 @@ public function __construct()
 	/**
 	 * Method to set the search parameters
 	 *
+	 * @param   string  $keyword   string search string
+	 * @param   string  $match     matching option, exact|any|all
+	 * @param   string  $ordering  option, newest|oldest|popular|alpha|category
+	 *
+	 * @return  void
+	 *
 	 * @access	public
-	 * @param string search string
-	 * @param string mathcing option, exact|any|all
-	 * @param string ordering option, newest|oldest|popular|alpha|category
 	 */
 	public function setSearch($keyword, $match = 'all', $ordering = 'newest')
 	{
@@ -123,19 +126,6 @@ public function setSearch($keyword, $match = 'all', $ordering = 'newest')
 		}
 	}
 
-	/**
-	 * Method to set the search areas
-	 *
-	 * @access	public
-	 * @param   array  Active areas
-	 * @param   array  Search areas
-	 */
-	public function setAreas($active = array(), $search = array())
-	{
-		$this->_areas['active'] = $active;
-		$this->_areas['search'] = $search;
-	}
-
 	/**
 	 * Method to get weblink item data for the category
 	 *
@@ -159,16 +149,20 @@ public function getData()
 			);
 
 			$rows = array();
+
 			foreach ($results as $result)
 			{
 				$rows = array_merge((array) $rows, (array) $result);
 			}
 
 			$this->_total	= count($rows);
+
 			if ($this->getState('limit') > 0)
 			{
-				$this->_data	= array_splice($rows, $this->getState('limitstart'), $this->getState('limit'));
-			} else {
+				$this->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit'));
+			}
+			else
+			{
 				$this->_data = $rows;
 			}
 		}
@@ -187,6 +181,22 @@ public function getTotal()
 		return $this->_total;
 	}
 
+	/**
+	 * Method to set the search areas
+	 *
+	 * @param   array  $active  areas
+	 * @param   array  $search  areas
+	 *
+	 * @return  void
+	 *
+	 * @access	public
+	 */
+	public function setAreas($active = array(), $search = array())
+	{
+		$this->_areas['active'] = $active;
+		$this->_areas['search'] = $search;
+	}
+
 	/**
 	 * Method to get a pagination object of the weblink items for the category
 	 *
@@ -207,6 +217,8 @@ public function getPagination()
 	/**
 	 * Method to get the search areas
 	 *
+	 * @return int
+	 *
 	 * @since 1.5
 	 */
 	public function getAreas()
diff --git a/components/com_search/router.php b/components/com_search/router.php
index 9f2fa81eb614d..b1e68ef2e83a9 100644
--- a/components/com_search/router.php
+++ b/components/com_search/router.php
@@ -78,22 +78,39 @@ public function parse(&$segments)
 	}
 }
 
+
 /**
- * Search router functions
+ * searchBuildRoute
  *
- * These functions are proxys for the new router interface
+ * These functions are proxies for the new router interface
  * for old SEF extensions.
  *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return array
+ *
  * @deprecated  4.0  Use Class based routers instead
  */
-function SearchBuildRoute(&$query)
+function searchBuildRoute(&$query)
 {
 	$router = new SearchRouter;
 
 	return $router->build($query);
 }
 
-function SearchParseRoute($segments)
+/**
+ * searchParseRoute
+ *
+ * These functions are proxies for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function searchParseRoute($segments)
 {
 	$router = new SearchRouter;
 
diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php
index 9eeb954353086..0bd34080a2d29 100644
--- a/components/com_search/views/search/view.html.php
+++ b/components/com_search/views/search/view.html.php
@@ -158,41 +158,115 @@ public function display($tpl = null)
 					$needle      = $searchwords[0];
 				}
 
-				$row         = SearchHelper::prepareSearchContent($row, $needle);
-				$searchwords = array_values(array_unique($searchwords));
-				$srow        = strtolower(SearchHelper::remove_accents($row));
-				$hl1         = '<span class="highlight">';
-				$hl2         = '</span>';
-				$cnt         = 0;
+				$row          = SearchHelper::prepareSearchContent($row, $needle);
+				$searchwords  = array_values(array_unique($searchwords));
+				$srow         = strtolower(SearchHelper::remove_accents($row));
+				$hl1          = '<span class="highlight">';
+				$hl2          = '</span>';
+				$posCollector = array();
+				$mbString     = extension_loaded('mbstring');
+
+				if ($mbString)
+				{
+					// E.g. german umlauts like ä are converted to ae and so
+					// $pos calculated with $srow doesn't match for $row
+					$correctPos     = (mb_strlen($srow) > mb_strlen($row));
+					$highlighterLen = mb_strlen($hl1 . $hl2);
+				}
+				else
+				{
+					// E.g. german umlauts like ä are converted to ae and so
+					// $pos calculated with $srow desn't match for $row
+					$correctPos     = (JString::strlen($srow) > JString::strlen($row));
+					$highlighterLen = JString::strlen($hl1 . $hl2);
+				}
 
 				foreach ($searchwords as $hlword)
 				{
-					if (extension_loaded('mbstring'))
+					if ($mbString)
 					{
 						if (($pos = mb_strpos($srow, strtolower(SearchHelper::remove_accents($hlword)))) !== false)
 						{
-							$pos += $cnt * mb_strlen($hl1 . $hl2);
-							$cnt++;
-
-							// iconv transliterates '€' to 'EUR'
+							// Iconv transliterates '€' to 'EUR'
 							// TODO: add other expanding translations?
 							$eur_compensation = $pos > 0 ? substr_count($row, "\xE2\x82\xAC", 0, $pos) * 2 : 0;
-							$pos -= $eur_compensation;
-							$row = mb_substr($row, 0, $pos) . $hl1 . mb_substr($row, $pos, mb_strlen($hlword)) . $hl2 . mb_substr($row, $pos + mb_strlen($hlword));
+							$pos              -= $eur_compensation;
+
+							if ($correctPos)
+							{
+								// Calculate necessary corrections from 0 to current $pos
+								$ChkRow     = mb_substr($row, 0, $pos);
+								$sChkRowLen = mb_strlen(strtolower(SearchHelper::remove_accents($ChkRow)));
+								$ChkRowLen  = mb_strlen($ChkRow);
+
+								// Correct $pos
+								$pos -= ($sChkRowLen - $ChkRowLen);
+							}
+
+							// Collect pos and searchword
+							$posCollector[$pos] = $hlword;
 						}
 					}
 					else
 					{
 						if (($pos = JString::strpos($srow, strtolower(SearchHelper::remove_accents($hlword)))) !== false)
 						{
-							$pos += $cnt * JString::strlen($hl1 . $hl2);
-							$cnt++;
-
-							// iconv transliterates '€' to 'EUR'
+							// Iconv transliterates '€' to 'EUR'
 							// TODO: add other expanding translations?
 							$eur_compensation = $pos > 0 ? substr_count($row, "\xE2\x82\xAC", 0, $pos) * 2 : 0;
-							$pos -= $eur_compensation;
-							$row = JString::substr($row, 0, $pos) . $hl1 . JString::substr($row, $pos, JString::strlen($hlword)) . $hl2 . JString::substr($row, $pos + JString::strlen($hlword));
+							$pos              -= $eur_compensation;
+
+							if ($correctPos)
+							{
+								// Calculate necessary corrections from 0 to current $pos
+								$ChkRow     = JString::substr($row, 0, $pos);
+								$sChkRowLen = JString::strlen(strtolower(SearchHelper::remove_accents($ChkRow)));
+								$ChkRowLen  = JString::strlen($ChkRow);
+
+								// Correct $pos
+								$pos -= ($sChkRowLen - $ChkRowLen);
+							}
+
+							// Collect pos and searchword
+							$posCollector[$pos] = $hlword;
+						}
+					}
+				}
+
+				if (count($posCollector))
+				{
+					// Sort by pos. Easier to handle overlapping highlighter-spans
+					ksort($posCollector);
+					$cnt                = 0;
+					$lastHighlighterEnd = -1;
+
+					foreach ($posCollector as  $pos => $hlword)
+					{
+						$pos += $cnt * $highlighterLen;
+
+						/* Avoid overlapping/corrupted highlighter-spans
+						 * TODO $chkOverlap could be used to highlight remaining part
+						 * of searchword outside last highlighter-span.
+						 * At the moment no additional highlighter is set.*/
+						$chkOverlap = $pos - $lastHighlighterEnd;
+
+						if ($chkOverlap >= 0)
+						{
+							// Set highlighter around searchword
+							if ($mbString)
+							{
+								$hlwordLen = mb_strlen($hlword);
+								$row       = mb_substr($row, 0, $pos) . $hl1 . mb_substr($row, $pos, $hlwordLen) . $hl2 . mb_substr($row, $pos + $hlwordLen);
+							}
+							else
+							{
+								$hlwordLen = JString::strlen($hlword);
+								$row = JString::substr($row, 0, $pos) . $hl1 . JString::substr($row, $pos, JString::strlen($hlword))
+									. $hl2 . JString::substr($row, $pos + JString::strlen($hlword));
+							}
+
+							$cnt++;
+							$lastHighlighterEnd = $pos + $hlwordLen + $highlighterLen;
 						}
 					}
 				}
diff --git a/components/com_search/views/search/view.opensearch.php b/components/com_search/views/search/view.opensearch.php
index 41c58c8a1a781..1cee87d9183dd 100644
--- a/components/com_search/views/search/view.opensearch.php
+++ b/components/com_search/views/search/view.opensearch.php
@@ -18,6 +18,15 @@
  */
 class SearchViewSearch extends JViewLegacy
 {
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  name of the template
+	 *
+	 * @throws Exception
+	 * @return  mixed  A string if successful, otherwise a Error object.
+	 */
+
 	public function display($tpl = null)
 	{
 		$doc = JFactory::getDocument();
diff --git a/components/com_users/controllers/registration.php b/components/com_users/controllers/registration.php
index 0368223101858..73b0481c684cb 100644
--- a/components/com_users/controllers/registration.php
+++ b/components/com_users/controllers/registration.php
@@ -176,7 +176,7 @@ public function register()
 			$app->setUserState('com_users.registration.data', $data);
 
 			// Redirect back to the edit screen.
-			$this->setMessage(JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $model->getError()), 'warning');
+			$this->setMessage($model->getError(), 'warning');
 			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration', false));
 
 			return false;
diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
index 4345e8fbbb64b..ace47b3aac6f4 100644
--- a/components/com_users/models/registration.php
+++ b/components/com_users/models/registration.php
@@ -71,10 +71,6 @@ public function activate($token)
 		// Activate the user.
 		$user = JFactory::getUser($userId);
 
-		// Permissions check for admin to activate user
-		$admin = JFactory::getUser();
-		$allow	= $admin->authorise('core.edit.state', 'com_users');
-
 		// Admin activation is on and user is verifying their email
 		if (($userParams->get('useractivation') == 2) && !$user->getParam('activate', 0))
 		{
@@ -143,7 +139,7 @@ public function activate($token)
 			}
 		}
 		// Admin activation is on and admin is activating the account
-		elseif (($userParams->get('useractivation') == 2) && $user->getParam('activate', 0) && $allow)
+		elseif (($userParams->get('useractivation') == 2) && $user->getParam('activate', 0))
 		{
 			$user->set('activation', '');
 			$user->set('block', '0');
@@ -380,7 +376,7 @@ public function register($temp)
 		// Store the data.
 		if (!$user->save())
 		{
-			$this->setError($user->getError());
+			$this->setError(JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $user->getError()));
 			return false;
 		}
 
diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
index 09c6a96fba94b..8715778f0e5ca 100644
--- a/components/com_users/views/login/tmpl/default_login.php
+++ b/components/com_users/views/login/tmpl/default_login.php
@@ -29,7 +29,7 @@
 		<?php endif; ?>
 
 		<?php if (($this->params->get('login_image') != '')) :?>
-			<img src="<?php echo $this->escape($this->params->get('login_image')); ?>" class="login-image" alt="<?php echo JTEXT::_('COM_USER_LOGIN_IMAGE_ALT')?>"/>
+			<img src="<?php echo $this->escape($this->params->get('login_image')); ?>" class="login-image" alt="<?php echo JTEXT::_('COM_USERS_LOGIN_IMAGE_ALT')?>"/>
 		<?php endif; ?>
 
 	<?php if (($this->params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>
diff --git a/components/com_weblinks/controllers/weblink.php b/components/com_weblinks/controllers/weblink.php
index f41de160430c1..81cb55c558b72 100644
--- a/components/com_weblinks/controllers/weblink.php
+++ b/components/com_weblinks/controllers/weblink.php
@@ -42,7 +42,6 @@ class WeblinksControllerWeblink extends JControllerForm
 	 */
 	public function add()
 	{
-
 		if (!parent::add())
 		{
 			// Redirect to the return page.
@@ -53,8 +52,10 @@ public function add()
 	/**
 	 * Method override to check if you can add a new record.
 	 *
-	 * @param   array  $data	An array of input data.
+	 * @param   array  $data  An array of input data.
+	 * 
 	 * @return  boolean
+	 * 
 	 * @since   1.6
 	 */
 	protected function allowAdd($data = array())
@@ -66,7 +67,7 @@ protected function allowAdd($data = array())
 		if ($categoryId)
 		{
 			// If the category has been passed in the URL check it.
-			$allow	= $user->authorise('core.create', $this->option.'.category.'.$categoryId);
+			$allow	= $user->authorise('core.create', $this->option . '.category.' . $categoryId);
 		}
 
 		if ($allow === null)
@@ -83,15 +84,16 @@ protected function allowAdd($data = array())
 	/**
 	 * Method to check if you can add a new record.
 	 *
-	 * @param   array  $data	An array of input data.
-	 * @param   string	$key	The name of the key for the primary key.
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
+	 * 
 	 * @since   1.6
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId   = (int) isset($data[$key]) ? $data[$key] : 0;
 		$categoryId = 0;
 
 		if ($recordId)
@@ -102,7 +104,7 @@ protected function allowEdit($data = array(), $key = 'id')
 		if ($categoryId)
 		{
 			// The category has been set. Check the category permissions.
-			return JFactory::getUser()->authorise('core.edit', $this->option.'.category.'.$categoryId);
+			return JFactory::getUser()->authorise('core.edit', $this->option . '.category.' . $categoryId);
 		}
 		else
 		{
@@ -114,9 +116,10 @@ protected function allowEdit($data = array(), $key = 'id')
 	/**
 	 * Method to cancel an edit.
 	 *
-	 * @param   string	$key	The name of the primary key of the URL variable.
+	 * @param   string  $key  The name of the primary key of the URL variable.
 	 *
-	 * @return  Boolean	True if access level checks pass, false otherwise.
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 * 
 	 * @since   1.6
 	 */
 	public function cancel($key = 'w_id')
@@ -130,10 +133,11 @@ public function cancel($key = 'w_id')
 	/**
 	 * Method to edit an existing record.
 	 *
-	 * @param   string	$key	The name of the primary key of the URL variable.
-	 * @param   string	$urlVar	The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
 	 *
-	 * @return  Boolean	True if access level check and checkout passes, false otherwise.
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 * 
 	 * @since   1.6
 	 */
 	public function edit($key = null, $urlVar = 'w_id')
@@ -146,11 +150,12 @@ public function edit($key = null, $urlVar = 'w_id')
 	/**
 	 * Method to get a model object, loading it if required.
 	 *
-	 * @param   string	$name	The model name. Optional.
-	 * @param   string	$prefix	The class prefix. Optional.
-	 * @param   array  $config	Configuration array for model. Optional.
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
 	 *
 	 * @return  object  The model.
+	 * 
 	 * @since   1.5
 	 */
 	public function getModel($name = 'form', $prefix = '', $config = array('ignore_request' => true))
@@ -163,10 +168,11 @@ public function getModel($name = 'form', $prefix = '', $config = array('ignore_r
 	/**
 	 * Gets the URL arguments to append to an item redirect.
 	 *
-	 * @param   integer  $recordId	The primary key id for the item.
-	 * @param   string	$urlVar		The name of the URL variable for the id.
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
 	 *
-	 * @return  string	The arguments to append to the redirect URL.
+	 * @return  string  The arguments to append to the redirect URL.
+	 * 
 	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = null)
@@ -177,12 +183,12 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = null)
 
 		if ($itemId)
 		{
-			$append .= '&Itemid='.$itemId;
+			$append .= '&Itemid=' . $itemId;
 		}
 
 		if ($return)
 		{
-			$append .= '&return='.base64_encode($return);
+			$append .= '&return=' . base64_encode($return);
 		}
 
 		return $append;
@@ -193,7 +199,8 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = null)
 	 *
 	 * If a "return" variable has been passed in the request
 	 *
-	 * @return  string	The return URL.
+	 * @return  string  The return URL.
+	 * 
 	 * @since   1.6
 	 */
 	protected function getReturnPage()
@@ -227,10 +234,11 @@ protected function postSaveHook(JModelLegacy $model, $validData = array())
 	/**
 	 * Method to save a record.
 	 *
-	 * @param   string	$key	The name of the primary key of the URL variable.
-	 * @param   string	$urlVar	The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
 	 *
-	 * @return  Boolean	True if successful, false otherwise.
+	 * @return  boolean  True if successful, false otherwise.
+	 * 
 	 * @since   1.6
 	 */
 	public function save($key = null, $urlVar = 'w_id')
@@ -250,6 +258,7 @@ public function save($key = null, $urlVar = 'w_id')
 	 * Go to a weblink
 	 *
 	 * @return  void
+	 * 
 	 * @since   1.6
 	 */
 	public function go()
@@ -299,7 +308,7 @@ public function go()
 		}
 
 		// Redirect to the URL
-		// TODO: Probably should check for a valid http link
+		// @todo: Probably should check for a valid http link
 		if ($link->url)
 		{
 			$modelLink->hit($id);
diff --git a/components/com_weblinks/router.php b/components/com_weblinks/router.php
index d4372169ea4eb..9ecd76e709302 100644
--- a/components/com_weblinks/router.php
+++ b/components/com_weblinks/router.php
@@ -236,7 +236,7 @@ public function parse(&$segments)
 						->select($db->quoteName('id'))
 						->from('#__weblinks')
 						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
-						->where($db->quoteName('alias') . ' = ' . $db->quote($db->quote(str_replace(':', '-', $segment))));
+						->where($db->quoteName('alias') . ' = ' . $db->quote(str_replace(':', '-', $segment)));
 					$db->setQuery($query);
 					$id = $db->loadResult();
 				}
diff --git a/components/com_weblinks/weblinks.php b/components/com_weblinks/weblinks.php
index 52833bb31a1d3..00b2209144002 100644
--- a/components/com_weblinks/weblinks.php
+++ b/components/com_weblinks/weblinks.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT.'/helpers/route.php';
+require_once JPATH_COMPONENT . '/helpers/route.php';
 
 $controller	= JControllerLegacy::getInstance('Weblinks');
 $controller->execute(JFactory::getApplication()->input->get('task'));
diff --git a/components/com_wrapper/controller.php b/components/com_wrapper/controller.php
index 29bf538751232..e390a6760ef88 100644
--- a/components/com_wrapper/controller.php
+++ b/components/com_wrapper/controller.php
@@ -21,13 +21,14 @@ class WrapperController extends JControllerLegacy
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JControllerLegacy  This object to support chaining.
+	 *
 	 * @since   1.5
 	 */
-	public function display($cachable = false, $urlparams = false)
+	public function display($cachable = false, $urlparams = array())
 	{
 		$cachable = true;
 
diff --git a/components/com_wrapper/router.php b/components/com_wrapper/router.php
index 4e5af20bf5efb..0206c3901c45c 100644
--- a/components/com_wrapper/router.php
+++ b/components/com_wrapper/router.php
@@ -77,16 +77,32 @@ public function parse(&$segments)
  * These functions are proxys for the new router interface
  * for old SEF extensions.
  *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
  * @deprecated  4.0  Use Class based routers instead
  */
-function WrapperBuildRoute(&$query)
+function wrapperBuildRoute(&$query)
 {
 	$router = new WrapperRouter;
 
 	return $router->build($query);
 }
 
-function WrapperParseRoute($segments)
+/**
+ * Wrapper router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function wrapperParseRoute($segments)
 {
 	$router = new WrapperRouter;
 
diff --git a/components/com_wrapper/views/wrapper/view.html.php b/components/com_wrapper/views/wrapper/view.html.php
index 566a5f37ce2f8..e7559e042fd14 100644
--- a/components/com_wrapper/views/wrapper/view.html.php
+++ b/components/com_wrapper/views/wrapper/view.html.php
@@ -17,14 +17,20 @@
 class WrapperViewWrapper extends JViewLegacy
 {
 	/**
-	 * @since  1.5
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
+	 *
+	 * @since   1.5
 	 */
 	public function display($tpl = null)
 	{
 		$app    = JFactory::getApplication();
 		$params = $app->getParams();
 
-		// because the application sets a default page title, we need to get it
+		// Because the application sets a default page title, we need to get it
 		// right from the menu item itself
 		$title = $params->get('page_title', '');
 
@@ -59,7 +65,8 @@ public function display($tpl = null)
 		}
 
 		$wrapper = new stdClass;
-		// auto height control
+
+		// Auto height control
 		if ($params->def('height_auto'))
 		{
 			$wrapper->load = 'onload="iFrameHeight()"';
@@ -73,10 +80,10 @@ public function display($tpl = null)
 
 		if ($params->def('add_scheme', 1))
 		{
-			// adds 'http://' if none is set
+			// Adds 'http://' if none is set
 			if (substr($url, 0, 1) == '/')
 			{
-				// relative url in component. use server http_host.
+				// Relative url in component. Use server http_host.
 				$wrapper->url = 'http://' . $_SERVER['HTTP_HOST'] . $url;
 			}
 			elseif (!strstr($url, 'http') && !strstr($url, 'https'))
@@ -93,7 +100,7 @@ public function display($tpl = null)
 			$wrapper->url = $url;
 		}
 
-		//Escape strings for HTML output
+		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 		$this->params        = &$params;
 		$this->wrapper       = &$wrapper;
diff --git a/installation/application/framework.php b/installation/application/framework.php
index 4fd90bc3efe37..55e345f5c7d97 100644
--- a/installation/application/framework.php
+++ b/installation/application/framework.php
@@ -13,7 +13,6 @@
  * Joomla system checks.
  */
 
-error_reporting(E_ALL);
 const JDEBUG = false;
 @ini_set('magic_quotes_runtime', 0);
 
diff --git a/installation/language/es-ES/es-ES.ini b/installation/language/es-ES/es-ES.ini
index b39cebd5aabbd..418cbd891f6a5 100644
--- a/installation/language/es-ES/es-ES.ini
+++ b/installation/language/es-ES/es-ES.ini
@@ -1,7 +1,5 @@
-; $Id: es-ES.ini $
 ; Joomla! Project
 ; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
-; Copyright (C) Translation 2008 - 2014 comunidadjoomla.org. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note: All the ini files need to be saved as UTF-8 - NO BOM!
 
@@ -67,7 +65,7 @@ INSTL_FTP_PASSWORD_DESC="¡Advertencia! Es recomendable dejar esto en blanco e i
 INSTL_SITE="Configuración principal"
 INSTL_ADMIN_EMAIL_LABEL="El correo electrónico del administrador"
 INSTL_ADMIN_EMAIL_DESC="Introduzca una dirección de correo electrónico. Debe ser la dirección de correo electrónico del súper administrador del sitio."
-INSTL_ADMIN_PASSWORD_LABEL="Contraseña del adminsitrador"
+INSTL_ADMIN_PASSWORD_LABEL="Contraseña del administrador"
 INSTL_ADMIN_PASSWORD_DESC="Asigne la contraseña de la cuenta del súper administrador y confírmela en el campo de más abajo."
 INSTL_ADMIN_PASSWORD2_LABEL="Confirmar la contraseña del administrador"
 INSTL_ADMIN_USER_LABEL="Nombre de usuario del administrador"
@@ -160,7 +158,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla no ha podido crear autom
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla no ha podido publicar automáticamente el módulo 'Selector del idioma'"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla no ha podido habilitar automáticamente el plugin 'Código del idioma'."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla no ha podido habilitar automáticamente el plugin 'Filtrar idiomas'."
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla no ha podido instalar el idiomas %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla no ha podido instalar el idioma %s."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla no ha podido publicar automáticamente el módulo de 'Estado del sitio multiidioma'."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla no ha podido despublicar automáticamente el módulo del menú predeterminado"
 INSTL_DEFAULTLANGUAGE_DESC="Joomla ha instalado los siguientes idiomas. Por favor, seleccione el idioma que desea usar como predeterminado para la administración."
@@ -169,7 +167,7 @@ INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma predeterminado para el sitio"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla no ha podido asignar el idioma como predeterminado. Se usará el idioma inglés como el predeterminado para el sitio."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla ha asignado el idioma %s como el predeterminado para el sitio."
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalar contenido para el idioma"
-INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Si está activado, Joomla creará automáticamente una catecogía del idioma del contenido para cada idioma instalado. También se creará, en cada una de esas categorías, un artículo destacado con texto inventado."
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Si está activado, Joomla creará automáticamente una categoría del idioma del contenido para cada idioma instalado. También se creará, en cada una de esas categorías, un artículo destacado con texto inventado."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multiidioma"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Esta sección le permite activar automáticamente las careacterísticas multiidioma de Joomla!"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="después también podrá instalarlo usando la administración de Joomla!"
@@ -190,7 +188,7 @@ INSTL_DATABASE_FIX_TOO_LONG="El prefijo de las tablas de MySQL debe ser como má
 INSTL_DATABASE_INVALID_DB_DETAILS="Los detalles proporcionados de la base de datos son incorrectos o los hay que están vacíos."
 INSTL_DATABASE_INVALID_MYSQL_VERSION="Necesita de MySQL 5.0.4 o superior para poder continuar con la instalación. Su versión es la: %s"
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="Neecesita de MySQL 5.0.4 o superior para continuar con la instalación. Su versión es la: %s"
-INSTL_DATABASE_INVALID_SQLSRV_VERSION="Necesita de SQL Server 2008 R2 (10.50.1600.1) o superior para poder continuar con la instalación.Su versión es la: %s"
+INSTL_DATABASE_INVALID_SQLSRV_VERSION="Necesita de SQL Server 2008 R2 (10.50.1600.1) o superior para poder continuar con la instalación. Su versión es la: %s"
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Necesita de SQL Server 2008 R2 (10.50.1600.1) o superior para poder continuar con la instalación. Su versión es la: %s"
 INSTL_DATABASE_INVALID_TYPE="Por favor, seleccione el tipo de base de datos"
 INSTL_DATABASE_NAME_TOO_LONG="El nombre de a base de datos de MySQL debe ser como máximo de 64 caracteres."
@@ -208,7 +206,7 @@ INSTL_PAGE_TITLE="Instalador web de Joomla!"
 
 ;Configuration model
 INSTL_ERROR_CONNECT_DB="No se puede conectar con la base de datos. Número de error del conector devuelto: %s"
-INSTL_STD_OFFLINE_MSG="Este sitio está cerrado por tareas de mantenimiento.<br /> Por favor, inténtelo nuevamente más tarde."
+INSTL_STD_OFFLINE_MSG="Este sitio está cerrado por tareas de mantenimiento.<br />Por favor, inténtelo nuevamente más tarde."
 
 ;FTP model
 INSTL_FTP_INVALIDROOT="El directorio FTP especificado, no es el directorio raíz de Joomla!"
@@ -251,7 +249,7 @@ INSTL_SAFE_MODE="Modo seguro"
 INSTL_SESSION_AUTO_START="Inicio automático de sesión"
 INSTL_WRITABLE="%s escribible"
 INSTL_XML_SUPPORT="Soporte XML"
-INSTL_ZIP_SUPPORT_AVAILABLE="Sporte ZIP nativo"
+INSTL_ZIP_SUPPORT_AVAILABLE="Soporte ZIP nativo"
 INSTL_ZLIB_COMPRESSION_SUPPORT="Soporte de compresión Zlib"
 INSTL_PROCESS_BUSY="El proceso está en progreso. Por favor, espere..."
 
@@ -287,7 +285,7 @@ JLIB_FORM_FIELD_INVALID="Campo inválido:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Campo inválido: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Campo obligatorio: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fallo al copiar el archivo file %1$s a %2$s."
-JLIB_INSTALLER_NOT_ERROR="Si el error está relacionado con la instalación de archivos del idioma del editor TinyMCE, no tendráningún efecto en la instalación del idioma o idiomas. Algunos paquetes del idioma anteriores a Joomla! 3.2.0 podrían estar intentando instalar los archivo del idioma del editor por separado. Como ahora esos archivos del editor se incluyen desde el núcleo de Joomla, no es necesario que sean instalados."
+JLIB_INSTALLER_NOT_ERROR="Si el error está relacionado con la instalación de archivos del idioma del editor TinyMCE, no tendrá ningún efecto en la instalación del idioma o idiomas. Algunos paquetes del idioma anteriores a Joomla! 3.2.0 podrían estar intentando instalar los archivo del idioma del editor por separado. Como ahora esos archivos del editor se incluyen desde el núcleo de Joomla, no es necesario que sean instalados."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No se puede conectar con la base de datos<br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini
index 9f59dfa544bff..c7d87402df18a 100644
--- a/installation/language/fa-IR/fa-IR.ini
+++ b/installation/language/fa-IR/fa-IR.ini
@@ -20,9 +20,9 @@ INSTL_WARNJSON="برای نصب جوملا نیاز است JSON روی پی اچ
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="کنترل مراحل نصب "
-INSTL_PRECHECK_DESC="برای نصب باید تمام گزینه های روبرو پشتیبانی شوند. در صورتی که هر یک از گزینه ها با <strong class="_QQ_"label label-important"_QQ_">خیر</strong> نمایش داده شوند، ممکن است برای نصب و استفاده از جوملا به مشکل روبرو شوید."
+INSTL_PRECHECK_DESC="برای نصب باید تمام گزینه های روبرو پشتیبانی شوند. در صورتی که هر یک از گزینه ها با <strong class="_QQ_"label label-important"_QQ_">خیر</strong> نمایش داده شوند، ممکن است برای نصب و استفاده از جوملا با مشکل روبرو شوید."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="تنظیمات سفارشی:"
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="این تنظیمات تعیین می کند که آیا PHP شما تطابق کامل با جوملا دارد یا خیر .<br />هرچند، جوملا! بر این عملیات ناظر بوده و تنظیمات مورد نیاز برای تطابق را انجام می دهد."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="این تنظیمات تعیین می کند که آیا PHP شما تطابق کامل با جوملا دارد یا خیر .<br />هر چند، جوملا! بر این عملیات ناظر بوده و تنظیمات مورد نیاز برای تطابق را انجام می دهد."
 INSTL_PRECHECK_DIRECTIVE=" دستور"
 INSTL_PRECHECK_RECOMMENDED="پیشنهادی"
 INSTL_PRECHECK_ACTUAL="واقعی"
@@ -31,7 +31,7 @@ INSTL_PRECHECK_ACTUAL="واقعی"
 INSTL_DATABASE="تنظیمات پایگاه داده"
 INSTL_DATABASE_HOST_DESC="این گزینه معمولا &quot;localhost&quot; است"
 INSTL_DATABASE_HOST_LABEL="نام هاست"
-INSTL_DATABASE_NAME_DESC="بعضی از هاست ها تنها برخی از نام دسی بل در سایت را اجازه می دهند . استفاده از پیشوند جدول برای مشخص کردن جوملا! سایت ها."
+INSTL_DATABASE_NAME_DESC="بعضی از هاست ها تنها برخی از نام پایگاه داده در سایت را اجازه می دهند . استفاده از پیشوند جدول برای مشخص کردن جوملا! سایت ها."
 INSTL_DATABASE_NAME_LABEL="نام پایگاه داده "
 INSTL_DATABASE_NO_SCHEMA="هیچ شمای پایگاه داده ای برای این نوع پایگاه داده موجود نیست."
 INSTL_DATABASE_OLD_PROCESS_DESC="همه جداول بانک اطلاعاتی، با جداول جدید جایگزین خواهند شد"
@@ -49,11 +49,11 @@ INSTL_DATABASE_USER_LABEL="نام کاربری"
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="یافتن خودکار مسیر FTP"
 INSTL_FTP="تنظیمات FTP"
-INSTL_FTP_DESC="<p>این بخش مربوط به تنظیمات لایه FTP می باشد.لایه FTP به لایه ای که امکان انتقال فایل ها از سمت کاربر به سمت سرور را می دهد.اگر این تنظیمات این بخش را بدرستی وارد و تایید کرده باشید ، در نصب افزونه ها (امکانات اضافی ) به مشکل بر نمی خورید.همچنین از نظر امنیتی با تنظیم این لایه ، امنیت بیشتری بدست خواهید آورد. در صورتی که تمایل به مطالعه بیشتر و نحوه فعال سازی این بخش دارید ، می توانید لایه FTP را در گوگل جستجو کنید.</p><p><b>توجه:</b> اگر شما در حال نصب جوملا بر روی لوکال هاست یا ویندوز هستید ، نیاز نیست این بخش را فعال کنید.</p>"
+INSTL_FTP_DESC="<p>این بخش مربوط به تنظیمات لایه FTP می باشد.لایه FTP به لایه ای که امکان انتقال فایل ها از سمت کاربر به سمت سرور را می دهد.اگر این تنظیمات این بخش را بدرستی وارد و تایید کرده باشید ، در نصب افزونه ها (امکانات اضافی ) به مشکل بر نمی خورید. همچنین از نظر امنیتی با تنظیم این لایه ، امنیت بیشتری بدست خواهید آورد. در صورتی که تمایل به مطالعه بیشتر و نحوه فعال سازی این بخش دارید ، می توانید لایه FTP را در گوگل جستجو کنید.</p><p><b>توجه:</b> اگر شما در حال نصب جوملا بر روی لوکال هاست یا ویندوز هستید ، نیاز نیست این بخش را فعال کنید.</p>"
 INSTL_FTP_ENABLE_LABEL="فعال سازی لایه FTP"
 INSTL_FTP_HOST_LABEL="هاست FTP"
 INSTL_FTP_PASSWORD_LABEL="رمز عبور FTP"
-INSTL_FTP_PASSWORD_DESC="اخطار! توصیه می شود اینجا را خالی بگذارید و در هر بار انتقال فایلهایتان رمز عبور ftpرا وارد کنید."
+INSTL_FTP_PASSWORD_DESC="اخطار! توصیه می شود اینجا را خالی بگذارید و در هر بار انتقال فایلهایتان رمز عبور FTPرا وارد کنید."
 INSTL_FTP_PORT_LABEL="پورت FTP"
 INSTL_FTP_ROOT_LABEL="مسیر اصلی FTP"
 INSTL_FTP_SAVE_LABEL="ذخیره ی رمز عبور FTP"
@@ -272,11 +272,12 @@ JCHECK_AGAIN="بررسی مجدد"
 JERROR="خطا"
 JEMAIL="ایمیل"
 JGLOBAL_ISFREESOFTWARE="%s یک نرم افزار رایگان تحت مجوز %s می باشد."
+JGLOBAL_ISFREESOFTWARE_T="ترجمه شده توسط تیم برگزیده جوملا در ایران - %s دات کام"
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="این نسخه از فایل زبان با جوملای مورد استفاده سازگار نیست."
 JGLOBAL_SELECT_AN_OPTION="یک گزینه را انتخاب کنید"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="هیچ نتیجه ای نداشت"
 JGLOBAL_SELECT_SOME_OPTIONS="برخی از گزینه ها را انتخاب کنید"
-JINVALID_TOKEN="جدیدترین درخواست اخیر رد شد زیرا دارای رمز امنیت نامعتبر بود. لطفا دوباره صفحه را باز و سعی کنید."
+JINVALID_TOKEN="جدیدترین درخواست اخیر رد شد زیرا دارای رمز امنیتی نامعتبر بود. لطفا دوباره صفحه را باز و سعی کنید."
 JNEXT="ادامه"
 JNO="خیر"
 JNOTICE="توجه"
@@ -291,7 +292,7 @@ JYES="بلی"
 JLIB_DATABASE_ERROR_DATABASE="یک ایراد در پایگاه داده رخ داده است."
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="امکان اتصال به پایگاه داده وجود ندارد"
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="نمی توان بانک اطلاعاتی را بارگذاری کرد: %s"
-JLIB_ENVIRONMENT_SESSION_EXPIRED="مدت زمان ورود در این صفحه به اتمام رسیده است.لطفا دوباره صفحه را بارگذاری کنید."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="مدت زمان ورود در این صفحه به اتمام رسیده است. لطفا دوباره صفحه را بارگذاری کنید."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="کپی انجام نشد"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :فایل ها: مسیر پوشه وجود ندارد. مسیر: %s"
 JLIB_FORM_FIELD_INVALID="فیلد نامعتبر:&#160;"
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 25e2caa8fdc00..bec63fe540893 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1,4 +1,4 @@
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET time_zone = "+00:00";
 
 --
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` (
   UNIQUE KEY `idx_asset_name` (`name`),
   KEY `idx_lft_rgt` (`lft`,`rgt`),
   KEY `idx_parent_id` (`parent_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__assets`
@@ -92,7 +92,7 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 --
 
 CREATE TABLE IF NOT EXISTS `#__associations` (
-  `id` INT(11) NOT NULL COMMENT 'A reference to the associated item.',
+  `id` int(11) NOT NULL COMMENT 'A reference to the associated item.',
   `context` varchar(50) NOT NULL COMMENT 'The context of the associated item.',
   `key` char(32) NOT NULL COMMENT 'The key for the association computed from an md5 on associated ids.',
   PRIMARY KEY (`context`,`id`),
@@ -233,7 +233,7 @@ CREATE TABLE IF NOT EXISTS `#__categories` (
   KEY `idx_left_right` (`lft`,`rgt`),
   KEY `idx_alias` (`alias`),
   KEY `idx_language` (`language`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__categories`
@@ -396,13 +396,11 @@ CREATE TABLE IF NOT EXISTS `#__content_types` (
   `table` varchar(255) NOT NULL DEFAULT '',
   `rules` text NOT NULL,
   `field_mappings` text NOT NULL,
-  `router` varchar(255) NOT NULL  DEFAULT '',
+  `router` varchar(255) NOT NULL DEFAULT '',
   `content_history_options` varchar(5120) COMMENT 'JSON string for com_contenthistory options',
   PRIMARY KEY (`type_id`),
   KEY `idx_alias` (`type_alias`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10000;
-
--- --------------------------------------------------------
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=10000;
 
 --
 -- Dumping data for table `#__content_types`
@@ -419,8 +417,8 @@ INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`,
 (8, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'NewsfeedsHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
 (9, 'Weblinks Category', 'com_weblinks.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'WeblinksHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
 (10, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}', 'TagsHelperRoute::getTagRoute', '{"formFile":"administrator\\/components\\/com_tags\\/models\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
-(11, 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '','{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
-(12, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}','','{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+(11, 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
+(12, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
 (13, 'Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'),
 (14, 'User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/models\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
 (15, 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}');
@@ -485,7 +483,7 @@ CREATE TABLE IF NOT EXISTS `#__extensions` (
   KEY `element_clientid` (`element`,`client_id`),
   KEY `element_folder_clientid` (`element`,`folder`,`client_id`),
   KEY `extension` (`type`,`element`,`folder`,`client_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10000;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=10000;
 
 --
 -- Dumping data for table `#__extensions`
@@ -948,7 +946,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
   KEY `ordering` (`ordering`),
   KEY `access` (`access`),
   KEY `idx_parent_published` (`parent_id`,`state`,`access`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__finder_taxonomy`
@@ -1208,7 +1206,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` (
   UNIQUE KEY `idx_langcode` (`lang_code`),
   KEY `idx_access` (`access`),
   KEY `idx_ordering` (`ordering`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__languages`
@@ -1256,7 +1254,7 @@ CREATE TABLE IF NOT EXISTS `#__menu` (
   KEY `idx_alias` (`alias`),
   KEY `idx_path` (`path`(255)),
   KEY `idx_language` (`language`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=102;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=102;
 
 --
 -- Dumping data for table `#__menu`
@@ -1302,7 +1300,7 @@ CREATE TABLE IF NOT EXISTS `#__menu_types` (
   `description` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_menutype` (`menutype`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__menu_types`
@@ -1373,7 +1371,7 @@ CREATE TABLE IF NOT EXISTS `#__modules` (
   KEY `published` (`published`,`access`),
   KEY `newsfeeds` (`module`,`published`),
   KEY `idx_language` (`language`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=87;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=87;
 
 --
 -- Dumping data for table `#__modules`
@@ -1498,7 +1496,7 @@ CREATE TABLE IF NOT EXISTS `#__overrider` (
 -- Table structure for table `#__postinstall_messages`
 --
 
-CREATE TABLE `#__postinstall_messages` (
+CREATE TABLE IF NOT EXISTS `#__postinstall_messages` (
   `postinstall_message_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `extension_id` bigint(20) NOT NULL DEFAULT 700 COMMENT 'FK to #__extensions',
   `title_key` varchar(255) NOT NULL DEFAULT '' COMMENT 'Lang key for the title',
@@ -1514,7 +1512,7 @@ CREATE TABLE `#__postinstall_messages` (
   `version_introduced` varchar(50) NOT NULL DEFAULT '3.2.0' COMMENT 'Version when this message was introduced',
   `enabled` tinyint(3) NOT NULL DEFAULT 1,
   PRIMARY KEY (`postinstall_message_id`)
-) DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
 (700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1),
@@ -1609,8 +1607,8 @@ CREATE TABLE IF NOT EXISTS `#__tags` (
   `hits` int(10) unsigned NOT NULL DEFAULT 0,
   `language` char(7) NOT NULL,
   `version` int(10) unsigned NOT NULL DEFAULT 1,
-  `publish_up` datetime NOT NULL default '0000-00-00 00:00:00',
-  `publish_down` datetime NOT NULL default '0000-00-00 00:00:00',
+  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`),
   KEY `tag_idx` (`published`,`access`),
   KEY `idx_access` (`access`),
@@ -1619,14 +1617,16 @@ CREATE TABLE IF NOT EXISTS `#__tags` (
   KEY `idx_left_right` (`lft`,`rgt`),
   KEY `idx_alias` (`alias`),
   KEY `idx_language` (`language`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__tags`
 --
 
-INSERT INTO `#__tags` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`,`created_by_alias`, `modified_user_id`, `modified_time`, `images`, `urls`, `hits`, `language`, `version`) VALUES
-(1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '', '', '', '', '', '2011-01-01 00:00:01','', 0, '0000-00-00 00:00:00', '', '',  0, '*', 1);
+INSERT INTO `#__tags` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `created_by_alias`, `modified_user_id`, `modified_time`, `images`, `urls`, `hits`, `language`, `version`) VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '', '', '', '', '', '2011-01-01 00:00:01', '', 0, '0000-00-00 00:00:00', '', '', 0, '*', 1);
+
+-- --------------------------------------------------------
 
 --
 -- Table structure for table `#__template_styles`
@@ -1642,7 +1642,7 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
   PRIMARY KEY (`id`),
   KEY `idx_template` (`template`),
   KEY `idx_home` (`home`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=9;
 
 --
 -- Dumping data for table `#__template_styles`
@@ -1656,6 +1656,10 @@ INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `#__ucm_base`
+--
+
 CREATE TABLE IF NOT EXISTS `#__ucm_base` (
   `ucm_id` int(10) unsigned NOT NULL,
   `ucm_item_id` int(10) NOT NULL,
@@ -1675,18 +1679,18 @@ CREATE TABLE IF NOT EXISTS `#__ucm_base` (
 
 CREATE TABLE IF NOT EXISTS `#__ucm_content` (
   `core_content_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `core_type_alias`  varchar(255) NOT NULL DEFAULT '' COMMENT 'FK to the content types table',
+  `core_type_alias` varchar(255) NOT NULL DEFAULT '' COMMENT 'FK to the content types table',
   `core_title` varchar(255) NOT NULL,
   `core_alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
   `core_body` mediumtext NOT NULL,
   `core_state` tinyint(1) NOT NULL DEFAULT 0,
-  `core_checked_out_time`  varchar(255) NOT NULL DEFAULT '',
+  `core_checked_out_time` varchar(255) NOT NULL DEFAULT '',
   `core_checked_out_user_id` int(10) unsigned NOT NULL DEFAULT 0,
   `core_access` int(10) unsigned NOT NULL DEFAULT 0,
   `core_params` text NOT NULL,
   `core_featured` tinyint(4) unsigned NOT NULL DEFAULT 0,
   `core_metadata` varchar(2048) NOT NULL COMMENT 'JSON encoded metadata properties.',
-  `core_created_user_id` int(10) unsigned  NOT NULL DEFAULT 0,
+  `core_created_user_id` int(10) unsigned NOT NULL DEFAULT 0,
   `core_created_by_alias` varchar(255) NOT NULL DEFAULT '',
   `core_created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `core_modified_user_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'Most recent user that modified',
@@ -1743,6 +1747,7 @@ CREATE TABLE IF NOT EXISTS `#__ucm_history` (
   KEY `idx_save_date` (`save_date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
 
 --
 -- Table structure for table `#__updates`
@@ -1762,7 +1767,7 @@ CREATE TABLE IF NOT EXISTS `#__updates` (
   `data` text NOT NULL,
   `detailsurl` text NOT NULL,
   `infourl` text NOT NULL,
-  `extra_query` VARCHAR(1000) DEFAULT '',
+  `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Available Updates';
 
@@ -1779,9 +1784,9 @@ CREATE TABLE IF NOT EXISTS `#__update_sites` (
   `location` text NOT NULL,
   `enabled` int(11) DEFAULT 0,
   `last_check_timestamp` bigint(20) DEFAULT 0,
-  `extra_query` VARCHAR(1000) DEFAULT '',
+  `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_site_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Update Sites';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Update Sites';
 
 --
 -- Dumping data for table `#__update_sites`
@@ -1790,7 +1795,8 @@ CREATE TABLE IF NOT EXISTS `#__update_sites` (
 INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
 (1, 'Joomla! Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0),
 (2, 'Joomla! Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0),
-(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0);
+(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0),
+(4, 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 -- --------------------------------------------------------
 
@@ -1811,7 +1817,8 @@ CREATE TABLE IF NOT EXISTS `#__update_sites_extensions` (
 INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES
 (1, 700),
 (2, 700),
-(3, 600);
+(3, 600),
+(4, 28);
 
 -- --------------------------------------------------------
 
@@ -1830,7 +1837,7 @@ CREATE TABLE IF NOT EXISTS `#__usergroups` (
   KEY `idx_usergroup_title_lookup` (`title`),
   KEY `idx_usergroup_adjacency_lookup` (`parent_id`),
   KEY `idx_usergroup_nested_set_lookup` (`lft`,`rgt`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `#__usergroups`
@@ -1964,7 +1971,7 @@ CREATE TABLE IF NOT EXISTS `#__viewlevels` (
   `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_assetgroup_title_lookup` (`title`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=7;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=7;
 
 --
 -- Dumping data for table `#__viewlevels`
@@ -1976,6 +1983,7 @@ INSERT INTO `#__viewlevels` (`id`, `title`, `ordering`, `rules`) VALUES
 (3, 'Special', 2, '[6,3,8]'),
 (5, 'Guest', 0, '[9]'),
 (6, 'Super Users', 0, '[8]');
+
 -- --------------------------------------------------------
 
 --
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 58625edadf719..8923cd347c1ac 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -1716,7 +1716,8 @@ COMMENT ON TABLE "#__update_sites" IS 'Update Sites';
 INSERT INTO "#__update_sites" ("update_site_id", "name", "type", "location", "enabled", "last_check_timestamp") VALUES
 (1, 'Joomla! Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0),
 (2, 'Joomla! Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0),
-(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0);
+(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0),
+(4, 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 --
 -- Table: #__update_sites_extensions
@@ -1735,7 +1736,8 @@ COMMENT ON TABLE "#__update_sites_extensions" IS 'Links extensions to update sit
 INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES
 (1, 700),
 (2, 700),
-(3, 600);
+(3, 600),
+(4, 28);
 
 --
 -- Table: #__usergroups
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index f74b6ec506a35..7189fcbe7574c 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -2753,7 +2753,9 @@ SELECT 1, 'Joomla! Core', 'collection', 'http://update.joomla.org/core/list.xml'
 UNION ALL
 SELECT 2, 'Joomla! Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0
 UNION ALL
-SELECT 3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0;
+SELECT 3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0
+UNION ALL
+SELECT 4, 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0;
 
 SET IDENTITY_INSERT [#__update_sites] OFF;
 
@@ -2775,7 +2777,9 @@ SELECT 1, 700
 UNION ALL
 SELECT 2, 700
 UNION ALL
-SELECT 3, 600;
+SELECT 3, 600
+UNION ALL
+SELECT 4, 28;
 
 /****** Object:  Table [#__updates] ******/
 SET QUOTED_IDENTIFIER ON;
diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini
index d4d6fcc4a42b7..76d99a58d1eaf 100644
--- a/language/en-GB/en-GB.com_users.ini
+++ b/language/en-GB/en-GB.com_users.ini
@@ -41,6 +41,7 @@ COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE="The passwords you entered do not match.
 COM_USERS_FIELD_RESET_PASSWORD2_DESC="Confirm your new password"
 COM_USERS_FIELD_RESET_PASSWORD2_LABEL="Confirm Password:"
 COM_USERS_INVALID_EMAIL="Invalid email address"
+COM_USERS_LOGIN_IMAGE_ALT="Login image"
 COM_USERS_LOGIN_REGISTER="Don't have an account?"
 COM_USERS_LOGIN_REMEMBER_ME="Remember me"
 COM_USERS_LOGIN_REMIND="Forgot your username?"
diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index 70bb96a1d5813..351df42d3454e 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -163,7 +163,7 @@ JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
 JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
 JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
 JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore directory %s. Please check the effective permissions."
-JGLOBAL_AUTH_PASS_BLANK="LDAP can not have blank password"
+JGLOBAL_AUTH_PASS_BLANK="LDAP can't have blank password"
 JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
 JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted"
 JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user"
@@ -311,7 +311,7 @@ THOUSANDS_SEPARATOR=","
 PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient email address."
 PHPMAILER_MAILER_IS_NOT_SUPPORTED=" Mailer is not supported."
 PHPMAILER_EXECUTE="Could not execute: "
-PHPMAILER_INSTANTIATE="Could not instantiate mail function."
+PHPMAILER_INSTANTIATE="Could not start mail function."
 PHPMAILER_AUTHENTICATE="SMTP Error! Could not authenticate."
 PHPMAILER_FROM_FAILED="The following from address failed: "
 PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
diff --git a/language/en-GB/en-GB.lib_idna_convert.sys.ini b/language/en-GB/en-GB.lib_idna_convert.sys.ini
index 42bb74cab824f..3aa8d8b8ddab5 100644
--- a/language/en-GB/en-GB.lib_idna_convert.sys.ini
+++ b/language/en-GB/en-GB.lib_idna_convert.sys.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
 
-LIB_IDNA_XML_DESCRIPTION="The class idna_convert allows to convert internationalized domain names (see RFC 3490, 3491, 3492 and 3454 for details) as they can be used with various registries worldwide to be translated between their original (localized) form and their encoded form as it will be used in the DNS (Domain Name System)."
+LIB_IDNA_XML_DESCRIPTION="The class idna_convert allows to convert internationalised domain names (see RFC 3490, 3491, 3492 and 3454 for details) as they can be used with various registries worldwide to be translated between their original (localised) form and their encoded form as it will be used in the DNS (Domain Name System)."
 
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index 4dc5ba098f523..f158f0ef3f83e 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -263,7 +263,7 @@ JLIB_FILESYSTEM_ERROR_FOLDER_OPEN="Unable to open source folder"
 JLIB_FILESYSTEM_ERROR_FOLDER_LOOP="Infinite loop detected"
 JLIB_FILESYSTEM_ERROR_FOLDER_PATH="Path not in open_basedir paths"
 JLIB_FILESYSTEM_ERROR_COULD_NOT_CREATE_DIRECTORY="Could not create directory"
-JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY="You can not delete a base directory."
+JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY="You can't delete a base directory."
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :delete: Path is not a folder. Path: %s"
 JLIB_FILESYSTEM_ERROR_FOLDER_DELETE="JFolder: :delete: Could not delete folder. Path: %s"
 JLIB_FILESYSTEM_ERROR_FOLDER_RENAME="Rename failed: %s"
@@ -640,7 +640,7 @@ JLIB_USER_ERROR_PASSWORD_NOT_MATCH="Passwords do not match. Please re-enter pass
 JLIB_USER_ERROR_UNABLE_TO_FIND_USER="Unable to find a user with given activation string"
 JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="JUser: :_load: Unable to load user with ID: %s"
 JLIB_USER_EXCEPTION_ACCESS_USERGROUP_INVALID="User Group does not exist"
-JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Instantiation Error"
+JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Startup Error"
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database <br />joomla.library: %1$s - %2$s"
 JLIB_UTIL_ERROR_DOMIT="DommitDocument is deprecated. Use DomDocument instead"
 JLIB_UTIL_ERROR_LOADING_FEED_DATA="Error loading feed data"
diff --git a/language/en-GB/en-GB.tpl_protostar.sys.ini b/language/en-GB/en-GB.tpl_protostar.sys.ini
index 4b270ddcaab9a..84e742b75f660 100644
--- a/language/en-GB/en-GB.tpl_protostar.sys.ini
+++ b/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -14,7 +14,7 @@ TPL_PROTOSTAR_POSITION_POSITION-14="Unused"
 TPL_PROTOSTAR_POSITION_POSITION-15="Unused"
 TPL_PROTOSTAR_POSITION_POSITION-1="Navigation"
 TPL_PROTOSTAR_POSITION_POSITION-2="Breadcrumbs"
-TPL_PROTOSTAR_POSITION_POSITION-3="Top center"
+TPL_PROTOSTAR_POSITION_POSITION-3="Top centre"
 TPL_PROTOSTAR_POSITION_POSITION-4="Unused"
 TPL_PROTOSTAR_POSITION_POSITION-5="Unused"
 TPL_PROTOSTAR_POSITION_POSITION-6="Unused"
diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index 8b0622966515e..4c064946bdf15 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -13,17 +13,17 @@
 
 ?>
 <?php if (!empty($displayData)) : ?>
-	<div class="tags">
+	<ul class="tags inline">
 		<?php foreach ($displayData as $i => $tag) : ?>
 			<?php if (in_array($tag->access, JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id')))) : ?>
 				<?php $tagParams = new JRegistry($tag->params); ?>
 				<?php $link_class = $tagParams->get('tag_link_class', 'label label-info'); ?>
-				<span class="tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i ?>" itemprop="keywords">
+				<li class="tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i ?>" itemprop="keywords">
 					<a href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($tag->tag_id . '-' . $tag->alias)) ?>" class="<?php echo $link_class; ?>">
 						<?php echo $this->escape($tag->title); ?>
 					</a>
-				</span>
+				</li>
 			<?php endif; ?>
 		<?php endforeach; ?>
-	</div>
+	</ul>
 <?php endif; ?>
diff --git a/layouts/joomla/searchtools/default/togglesidebar.php b/layouts/joomla/searchtools/default/togglesidebar.php
new file mode 100644
index 0000000000000..6c4ff16b760f7
--- /dev/null
+++ b/layouts/joomla/searchtools/default/togglesidebar.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+// Set the tooltips
+JText::script('JSEARCH_HIDE_SIDEBAR');
+JText::script('JSEARCH_SHOW_SIDEBAR');
+?>
+<div
+	id="j-toggle-sidebar-button"
+	class="hidden-phone hasTooltip"
+	title="<?php echo JHtml::tooltipText('JSEARCH_HIDE_SIDEBAR'); ?>"
+	type="button"
+	onclick="Joomla.toggleSidebar(false); return false;"
+	>
+	<span id="j-toggle-sidebar-icon" class="icon-remove"></span>
+</div>
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index 99088f914bfbb..5de8484640528 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -8,8 +8,18 @@
  */
 
 defined('JPATH_BASE') or die;
-
 ?>
+
+	<script type="text/javascript">
+		jQuery(function()
+		{
+			Joomla.toggleSidebar(true);
+		});
+	</script>
+
+	<div class="toggle-sidebar">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default.togglesidebar'); ?>
+	</div>
 <div id="sidebar">
 	<div class="sidebar-nav">
 		<?php if ($displayData->displayMenu) : ?>
diff --git a/libraries/cms/application/administrator.php b/libraries/cms/application/administrator.php
index 603770210e1e5..6c473aaab47e5 100644
--- a/libraries/cms/application/administrator.php
+++ b/libraries/cms/application/administrator.php
@@ -146,7 +146,7 @@ protected function doExecute()
 		 * $this->input->getCmd('option'); or $this->input->getCmd('view');
 		 * ex: due of the sef urls
 		 */
-		$this->checkUserRequireReset('com_admin', 'profile', 'edit', 'profile.save,profile.apply');
+		$this->checkUserRequireReset('com_admin', 'profile', 'edit', 'com_admin/profile.save,com_admin/profile.apply,com_login/logout');
 
 		// Dispatch the application
 		$this->dispatch();
diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index fe9e2727b6e07..daa34bd539c88 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -304,22 +304,32 @@ protected function checkUserRequireReset($option, $view, $layout, $tasks)
 				$option = $this->get($name . '_reset_password_option', '');
 				$view = $this->get($name . '_reset_password_view', '');
 				$layout = $this->get($name . '_reset_password_layout', '');
-				$tasks = explode(',', $this->get($name . '_reset_password_tasks', ''));
+				$tasks = $this->get($name . '_reset_password_tasks', '');
 			}
 
-			if ($this->input->getCmd('option', '') != $option || $this->input->getCmd('view', '') != $view || $this->input->getCmd('layout', '') != $layout)
+			$task = $this->input->getCmd('task', '');
+
+			// Check task or option/view/layout
+			if (!empty($task))
 			{
-				// Requested a different page
-				$redirect = true;
+				$tasks = explode(',', $tasks);
+
+				// Check full task version "option/task"
+				if (array_search($this->input->getCmd('option', '') . '/' . $task, $tasks) === false)
+				{
+					// Check short task version, must be on the same option of the view
+					if ($this->input->getCmd('option', '') != $option || array_search($task, $tasks) === false)
+					{
+						// Not permitted task
+						$redirect = true;
+					}
+				}
 			}
 			else
 			{
-				$task = $this->input->getCmd('task', '');
-
-				// Empty task are always permitted
-				if (!empty($task) && array_search($task, $tasks) === false)
+				if ($this->input->getCmd('option', '') != $option || $this->input->getCmd('view', '') != $view || $this->input->getCmd('layout', '') != $layout)
 				{
-					// Not permitted task
+					// Requested a different option/view/layout
 					$redirect = true;
 				}
 			}
diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index 221ce2ee77420..e941337e6002f 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -224,7 +224,7 @@ protected function doExecute()
 		 * $this->input->getCmd('option'); or $this->input->getCmd('view');
 		 * ex: due of the sef urls
 		 */
-		$this->checkUserRequireReset('com_users', 'profile', 'edit', 'profile.save,profile.apply');
+		$this->checkUserRequireReset('com_users', 'profile', 'edit', 'com_users/profile.save,com_users/profile.apply,com_users/user.logout');
 
 		// Dispatch the application
 		$this->dispatch();
diff --git a/libraries/cms/form/field/contenthistory.php b/libraries/cms/form/field/contenthistory.php
index 0bb72a6a1163d..33478dd0dc6b8 100644
--- a/libraries/cms/form/field/contenthistory.php
+++ b/libraries/cms/form/field/contenthistory.php
@@ -44,13 +44,13 @@ protected function getInput()
 			. $this->element['data-typeAlias'] . '&amp;' . JSession::getFormToken() . '=1';
 
 		// Load the modal behavior script.
-		JHtml::_('behavior.modal', 'a.modal_' . $this->id);
+		JHtml::_('behavior.modal', 'button.modal_' . $this->id);
 
-		$html[] = '		<a class="btn modal_' . $this->id . '" title="' . $label . '" href="' . $link . '"'
+		$html[] = '		<button class="btn modal_' . $this->id . '" title="' . $label . '" href="' . $link . '"'
 			. ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}">';
 		$html[] = '<i class="icon-archive"></i>';
 		$html[] = $label;
-		$html[] = '</a>';
+		$html[] = '</button>';
 
 		return implode("\n", $html);
 	}
diff --git a/libraries/cms/form/field/headertag.php b/libraries/cms/form/field/headertag.php
index 0cb5fa3e55c7f..226c8284d863f 100644
--- a/libraries/cms/form/field/headertag.php
+++ b/libraries/cms/form/field/headertag.php
@@ -38,7 +38,7 @@ class JFormFieldHeadertag extends JFormFieldList
 	protected function getOptions()
 	{
 		$options = array();
-		$tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p');
+		$tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'div');
 
 		// Create one new option object for each tag
 		foreach ($tags as $tag)
diff --git a/libraries/cms/form/field/media.php b/libraries/cms/form/field/media.php
index 30b5eabf94420..1ebfbe93a7a11 100644
--- a/libraries/cms/form/field/media.php
+++ b/libraries/cms/form/field/media.php
@@ -379,7 +379,8 @@ protected function getInput()
 					: 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;asset=' . $asset . '&amp;author='
 					. $this->form->getValue($this->authorField)) . '&amp;fieldid=' . $this->id . '&amp;folder=' . $folder) . '"'
 				. ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}">';
-			$html[] = JText::_('JLIB_FORM_BUTTON_SELECT') . '</a><a class="btn hasTooltip" title="' . JText::_('JLIB_FORM_BUTTON_CLEAR') . '" href="#" onclick="';
+			$html[] = JText::_('JLIB_FORM_BUTTON_SELECT') . '</a><a class="btn hasTooltip" title="'
+				. JText::_('JLIB_FORM_BUTTON_CLEAR') . '" href="#" onclick="';
 			$html[] = 'jInsertFieldValue(\'\', \'' . $this->id . '\');';
 			$html[] = 'return false;';
 			$html[] = '">';
diff --git a/libraries/cms/form/field/moduleposition.php b/libraries/cms/form/field/moduleposition.php
index 9ada467c8852f..b9aeaa3d06134 100644
--- a/libraries/cms/form/field/moduleposition.php
+++ b/libraries/cms/form/field/moduleposition.php
@@ -148,12 +148,14 @@ protected function getInput()
 
 		// Setup variables for display.
 		$html = array();
-		$link = 'index.php?option=com_modules&view=positions&layout=modal&tmpl=component&function=jSelectPosition_' . $this->id . '&amp;client_id=' . $this->clientId;
+		$link = 'index.php?option=com_modules&view=positions&layout=modal&tmpl=component&function=jSelectPosition_' . $this->id
+			. '&amp;client_id=' . $this->clientId;
 
 		// The current user display field.
 		$html[] = '<div class="input-append">';
 		$html[] = parent::getInput()
-			. '<a class="btn modal" title="' . JText::_('COM_MODULES_CHANGE_POSITION_TITLE') . '"  href="' . $link . '" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">'
+			. '<a class="btn modal" title="' . JText::_('COM_MODULES_CHANGE_POSITION_TITLE') . '"  href="' . $link
+			. '" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">'
 			. JText::_('COM_MODULES_CHANGE_POSITION_BUTTON') . '</a>';
 		$html[] = '</div>';
 
diff --git a/libraries/cms/form/field/tag.php b/libraries/cms/form/field/tag.php
index 8b08870e172fc..b39810d6938e1 100644
--- a/libraries/cms/form/field/tag.php
+++ b/libraries/cms/form/field/tag.php
@@ -116,9 +116,9 @@ protected function getOptions()
 
 		$db		= JFactory::getDbo();
 		$query	= $db->getQuery(true)
-			->select('a.id AS value, a.path, a.title AS text, a.level, a.published')
+			->select('DISTINCT a.id AS value, a.path, a.title AS text, a.level, a.published')
 			->from('#__tags AS a')
-			->join('LEFT', $db->quoteName('#__tags') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
+			->join('LEFT', $db->qn('#__tags') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
 
 		// Ajax tag only loads assigned values
 		if (!$this->isNested() && !empty($this->value))
@@ -132,10 +132,10 @@ protected function getOptions()
 		// Filter language
 		if (!empty($this->element['language']))
 		{
-			$query->where('a.language = ' . $db->quote($this->element['language']));
+			$query->where('a.language = ' . $db->q($this->element['language']));
 		}
 
-		$query->where($db->quoteName('a.alias') . ' <> ' . $db->quote('root'));
+		$query->where($db->qn('a.lft') . ' > 0');
 
 		// Filter on the published state
 		if (is_numeric($published))
@@ -148,8 +148,7 @@ protected function getOptions()
 			$query->where('a.published IN (' . implode(',', $published) . ')');
 		}
 
-		$query->group('a.id, a.title, a.level, a.lft, a.rgt, a.parent_id, a.published, a.path')
-			->order('a.lft ASC');
+		$query->order('a.lft ASC');
 
 		// Get the options.
 		$db->setQuery($query);
diff --git a/libraries/cms/form/field/user.php b/libraries/cms/form/field/user.php
index 923e91f7d9edf..ce7bb4506995b 100644
--- a/libraries/cms/form/field/user.php
+++ b/libraries/cms/form/field/user.php
@@ -57,7 +57,8 @@ protected function getInput()
 		$script[] = '		if (old_id != id) {';
 		$script[] = '			document.getElementById("' . $this->id . '_id").value = id;';
 		$script[] = '			document.getElementById("' . $this->id . '").value = title;';
-		$script[] = '			document.getElementById("' . $this->id . '").className = document.getElementById("' . $this->id . '").className.replace(" invalid" , "");';
+		$script[] = '			document.getElementById("'
+			. $this->id . '").className = document.getElementById("' . $this->id . '").className.replace(" invalid" , "");';
 		$script[] = '			' . $this->onchange;
 		$script[] = '		}';
 		$script[] = '		SqueezeBox.close();';
diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index 6f81871b79aff..e5c9825ee214d 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -102,6 +102,7 @@ public function canUpload($file, $component = 'com_media')
 		if (!empty($check))
 		{
 			$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice');
+
 			return false;
 		}
 
@@ -291,15 +292,15 @@ public function countFiles($dir)
 	}
 
 	/**
-	* Small helper function that properly converts any
-	* configuration options to their byte representation.
-	*
-	* @param   string|integer  $val  The value to be converted to bytes.
-	*
-	* @return integer The calculated bytes value from the input.
-	*
-	* @since 3.3
-	*/
+	 * Small helper function that properly converts any
+	 * configuration options to their byte representation.
+	 *
+	 * @param   string|integer  $val  The value to be converted to bytes.
+	 *
+	 * @return integer The calculated bytes value from the input.
+	 *
+	 * @since 3.3
+	 */
 	public function toBytes($val)
 	{
 		switch ($val[strlen($val) - 1])
diff --git a/libraries/cms/helper/route.php b/libraries/cms/helper/route.php
index 73a15f430baf1..d80b2b64f7081 100644
--- a/libraries/cms/helper/route.php
+++ b/libraries/cms/helper/route.php
@@ -246,9 +246,17 @@ protected function findItem($needles = array())
 	 * @return  string
 	 *
 	 * @since   3.2
+	 *
+	 * @throws  InvalidArgumentException
 	 */
-	public static function getCategoryRoute($catid, $language = 0, $extension)
+	public static function getCategoryRoute($catid, $language = 0, $extension = '')
 	{
+		// Note: $extension is required but has to be an optional argument in the function call due to argument order
+		if (empty($extension))
+		{
+			throw new InvalidArgumentException('$extension is a required argument in JHelperRoute::getCategoryRoute');
+		}
+
 		if ($catid instanceof JCategoryNode)
 		{
 			$id       = $catid->id;
diff --git a/libraries/cms/helper/tags.php b/libraries/cms/helper/tags.php
index d8004beb14d15..3fad9efdf6e5d 100644
--- a/libraries/cms/helper/tags.php
+++ b/libraries/cms/helper/tags.php
@@ -72,11 +72,27 @@ public function addTagMapping($ucmId, JTableInterface $table, $tags = array())
 
 		$query = $db->getQuery(true);
 		$query->insert('#__contentitem_tag_map');
-		$query->columns(array($db->quoteName('type_alias'), $db->quoteName('core_content_id'), $db->quoteName('content_item_id'), $db->quoteName('tag_id'), $db->quoteName('tag_date'),  $db->quoteName('type_id')));
+		$query->columns(
+			array(
+				$db->quoteName('type_alias'),
+				$db->quoteName('core_content_id'),
+				$db->quoteName('content_item_id'),
+				$db->quoteName('tag_id'),
+				$db->quoteName('tag_date'),
+				$db->quoteName('type_id')
+			)
+		);
 
 		foreach ($tags as $tag)
 		{
-			$query->values($db->quote($this->typeAlias) . ', ' . (int) $ucmId . ', ' . (int) $item . ', ' . $db->quote($tag) . ', ' . $query->currentTimestamp() . ', ' . (int) $typeId);
+			$query->values(
+				$db->quote($this->typeAlias)
+				. ', ' . (int) $ucmId
+				. ', ' . (int) $item
+				. ', ' . $db->quote($tag)
+				. ', ' . $query->currentTimestamp()
+				. ', ' . (int) $typeId
+			);
 		}
 
 		$db->setQuery($query);
@@ -522,9 +538,21 @@ public function getTagItemsQuery($tagId, $typesr = null, $includeChildren = fals
 		JArrayHelper::toInteger($stateFilters);
 
 		// M is the mapping table. C is the core_content table. Ct is the content_types table.
-		$query->select('m.type_alias, m.content_item_id, m.core_content_id, count(m.tag_id) AS match_count,  MAX(m.tag_date) as tag_date, MAX(c.core_title) AS core_title')
+		$query
+			->select(
+				'm.type_alias'
+				. ', ' . 'm.content_item_id'
+				. ', ' . 'm.core_content_id'
+				. ', ' . 'count(m.tag_id) AS match_count'
+				. ', ' . 'MAX(m.tag_date) as tag_date'
+				. ', ' . 'MAX(c.core_title) AS core_title'
+			)
 			->select('MAX(c.core_alias) AS core_alias, MAX(c.core_body) AS core_body, MAX(c.core_state) AS core_state, MAX(c.core_access) AS core_access')
-			->select('MAX(c.core_metadata) AS core_metadata, MAX(c.core_created_user_id) AS core_created_user_id, MAX(c.core_created_by_alias) AS core_created_by_alias')
+			->select(
+				'MAX(c.core_metadata) AS core_metadata'
+				. ', ' . 'MAX(c.core_created_user_id) AS core_created_user_id'
+				. ', ' . 'MAX(c.core_created_by_alias) AS core_created_by_alias'
+			)
 			->select('MAX(c.core_created_time) as core_created_time, MAX(c.core_images) as core_images')
 			->select('CASE WHEN c.core_modified_time = ' . $nullDate . ' THEN c.core_created_time ELSE c.core_modified_time END as core_modified_time')
 			->select('MAX(c.core_language) AS core_language, MAX(c.core_catid) AS core_catid')
@@ -532,7 +560,14 @@ public function getTagItemsQuery($tagId, $typesr = null, $includeChildren = fals
 			->select('MAX(ct.type_title) AS content_type_title, MAX(ct.router) AS router')
 
 			->from('#__contentitem_tag_map AS m')
-			->join('INNER', '#__ucm_content AS c ON m.type_alias = c.core_type_alias AND m.core_content_id = c.core_content_id AND c.core_state IN (' . implode(',', $stateFilters) . ')' . (in_array('0', $stateFilters) ? '' : ' AND (c.core_publish_up = ' . $nullDate . ' OR c.core_publish_up <= ' . $nowDate . ') AND (c.core_publish_down = ' . $nullDate . ' OR  c.core_publish_down >= ' . $nowDate . ')'))
+			->join(
+				'INNER',
+				'#__ucm_content AS c ON m.type_alias = c.core_type_alias AND m.core_content_id = c.core_content_id AND c.core_state IN ('
+					. implode(',', $stateFilters) . ')'
+					. (in_array('0', $stateFilters) ? '' : ' AND (c.core_publish_up = ' . $nullDate
+					. ' OR c.core_publish_up <= ' . $nowDate . ') '
+					. ' AND (c.core_publish_down = ' . $nullDate . ' OR  c.core_publish_down >= ' . $nowDate . ')')
+			)
 			->join('INNER', '#__content_types AS ct ON ct.type_alias = m.type_alias')
 
 			// Join over the users for the author and email
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index b22d5cfb8937b..1a36e0de43e50 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -603,7 +603,7 @@ public static function keepalive()
 		$lifetime = ($config->get('lifetime') * 60000);
 		$refreshTime = ($lifetime <= 60000) ? 30000 : $lifetime - 60000;
 
-		// Refresh time is 1 minute less than the liftime assined in the configuration.php file.
+		// Refresh time is 1 minute less than the lifetime assigned in the configuration.php file.
 
 		// The longest refresh period is one hour to prevent integer overflow.
 		if ($refreshTime > 3600000 || $refreshTime <= 0)
diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
index 62ff2edbce518..f65adda8de8db 100644
--- a/libraries/cms/html/email.php
+++ b/libraries/cms/html/email.php
@@ -73,11 +73,13 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true)
 					$replacement .= "\n var addy_text" . $rand . " = '" . $text . "';";
 				}
 
-				$replacement .= "\n document.getElementById('cloak$rand').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy" . $rand . " + '\'>'+addy_text" . $rand . "+'<\/a>';";
+				$replacement .= "\n document.getElementById('cloak$rand').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy"
+					. $rand . " + '\'>'+addy_text" . $rand . "+'<\/a>';";
 			}
 			else
 			{
-				$replacement .= "\n document.getElementById('cloak$rand').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy" . $rand . " + '\'>' +addy" . $rand . "+'<\/a>';";
+				$replacement .= "\n document.getElementById('cloak$rand').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy"
+					. $rand . " + '\'>' +addy" . $rand . "+'<\/a>';";
 			}
 		}
 		else
@@ -102,12 +104,15 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true)
 	 */
 	protected static function convertEncoding($text)
 	{
+		$text = html_entity_decode($text);
+
 		// Replace vowels with character encoding
 		$text = str_replace('a', '&#97;', $text);
 		$text = str_replace('e', '&#101;', $text);
 		$text = str_replace('i', '&#105;', $text);
 		$text = str_replace('o', '&#111;', $text);
 		$text = str_replace('u', '&#117;', $text);
+		$text = htmlentities($text, ENT_QUOTES, 'UTF-8', false);
 
 		return $text;
 	}
diff --git a/libraries/cms/html/formbehavior.php b/libraries/cms/html/formbehavior.php
index ce356c25ae258..45aed8376c2ec 100644
--- a/libraries/cms/html/formbehavior.php
+++ b/libraries/cms/html/formbehavior.php
@@ -55,11 +55,30 @@ public static function chosen($selector = '.advancedSelect', $debug = null, $opt
 		}
 
 		// Default settings
-		$options['disable_search_threshold']  = isset($options['disable_search_threshold']) ? $options['disable_search_threshold'] : 10;
-		$options['allow_single_deselect']     = isset($options['allow_single_deselect']) ? $options['allow_single_deselect'] : true;
-		$options['placeholder_text_multiple'] = isset($options['placeholder_text_multiple']) ? $options['placeholder_text_multiple']: JText::_('JGLOBAL_SELECT_SOME_OPTIONS');
-		$options['placeholder_text_single']   = isset($options['placeholder_text_single']) ? $options['placeholder_text_single'] : JText::_('JGLOBAL_SELECT_AN_OPTION');
-		$options['no_results_text']           = isset($options['no_results_text']) ? $options['no_results_text'] : JText::_('JGLOBAL_SELECT_NO_RESULTS_MATCH');
+		if (!isset($options['disable_search_threshold']))
+		{
+			$options['disable_search_threshold'] = 10;
+		}
+
+		if (!isset($options['allow_single_deselect']))
+		{
+			$options['allow_single_deselect'] = true;
+		}
+
+		if (!isset($options['placeholder_text_multiple']))
+		{
+			$options['placeholder_text_multiple'] = JText::_('JGLOBAL_SELECT_SOME_OPTIONS');
+		}
+
+		if (!isset($options['placeholder_text_single']))
+		{
+			$options['placeholder_text_single'] = JText::_('JGLOBAL_SELECT_AN_OPTION');
+		}
+
+		if (!isset($options['no_results_text']))
+		{
+			$options['no_results_text'] = JText::_('JGLOBAL_SELECT_NO_RESULTS_MATCH');
+		}
 
 		// Options array to json options string
 		$options_str = json_encode($options, ($debug && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false));
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php
index c4fe2b439dfdd..edb3cb22f20a2 100644
--- a/libraries/cms/html/grid.php
+++ b/libraries/cms/html/grid.php
@@ -126,7 +126,8 @@ public static function checkall($name = 'checkall-toggle', $tip = 'JGLOBAL_CHECK
 	{
 		JHtml::_('bootstrap.tooltip');
 
-		return '<input type="checkbox" name="' . $name . '" value="" class="hasTooltip" title="' . JHtml::tooltipText($tip) . '" onclick="' . $action . '" />';
+		return '<input type="checkbox" name="' . $name . '" value="" class="hasTooltip" title="' . JHtml::tooltipText($tip)
+			. '" onclick="' . $action . '" />';
 	}
 
 	/**
@@ -271,7 +272,8 @@ public static function state($filter_state = '*', $published = 'Published', $unp
 	 */
 	public static function order($rows, $image = 'filesave.png', $task = 'saveorder')
 	{
-		return '<a href="javascript:saveorder(' . (count($rows) - 1) . ', \'' . $task . '\')" rel="tooltip" class="saveorder btn btn-micro pull-right" title="'
+		return '<a href="javascript:saveorder('
+			. (count($rows) - 1) . ', \'' . $task . '\')" rel="tooltip" class="saveorder btn btn-micro pull-right" title="'
 			. JText::_('JLIB_HTML_SAVE_ORDER') . '"><i class="icon-menu-2"></i></a>';
 	}
 
diff --git a/libraries/cms/html/searchtools.php b/libraries/cms/html/searchtools.php
index 69224c41b44a1..b1e1939c867c5 100644
--- a/libraries/cms/html/searchtools.php
+++ b/libraries/cms/html/searchtools.php
@@ -134,7 +134,8 @@ private static function options2Jregistry($options)
 	 *
 	 * @return  string
 	 */
-	public static function sort($title, $order, $direction = 'asc', $selected = 0, $task = null, $new_direction = 'asc', $tip = '', $icon = null, $formName = 'adminForm')
+	public static function sort($title, $order, $direction = 'asc', $selected = 0, $task = null, $new_direction = 'asc', $tip = '', $icon = null,
+		$formName = 'adminForm')
 	{
 		$direction = strtolower($direction);
 		$orderIcons = array('icon-arrow-up-3', 'icon-arrow-down-3');
diff --git a/libraries/cms/html/sortablelist.php b/libraries/cms/html/sortablelist.php
index 69169028988b9..aac399a644628 100644
--- a/libraries/cms/html/sortablelist.php
+++ b/libraries/cms/html/sortablelist.php
@@ -37,8 +37,10 @@ abstract class JHtmlSortablelist
 	 * @return  void
 	 *
 	 * @since   3.0
+	 *
+	 * @throws  InvalidArgumentException
 	 */
-	public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderingUrl, $proceedSaveOrderButton = true, $nestedList = false)
+	public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderingUrl = null, $proceedSaveOrderButton = true, $nestedList = false)
 	{
 		// Only load once
 		if (isset(static::$loaded[__METHOD__]))
@@ -46,6 +48,12 @@ public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderi
 			return;
 		}
 
+		// Note: $i is required but has to be an optional argument in the function call due to argument order
+		if (null === $saveOrderingUrl)
+		{
+			throw new InvalidArgumentException('$saveOrderingUrl is a required argument in JHtmlSortablelist::sortable');
+		}
+
 		// Depends on jQuery UI
 		JHtml::_('jquery.ui', array('core', 'sortable'));
 
@@ -56,7 +64,8 @@ public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderi
 		JFactory::getDocument()->addScriptDeclaration("
 			(function ($){
 				$(document).ready(function (){
-					var sortableList = new $.JSortableList('#" . $tableId . " tbody','" . $formId . "','" . $sortDir . "' , '" . $saveOrderingUrl . "','','" . $nestedList . "');
+					var sortableList = new $.JSortableList('#"
+						. $tableId . " tbody','" . $formId . "','" . $sortDir . "' , '" . $saveOrderingUrl . "','','" . $nestedList . "');
 				});
 			})(jQuery);
 			"
diff --git a/libraries/cms/html/tag.php b/libraries/cms/html/tag.php
index 38e313f382a12..e7a0be1aad17c 100644
--- a/libraries/cms/html/tag.php
+++ b/libraries/cms/html/tag.php
@@ -163,10 +163,9 @@ public static function tags($config = array('filter.published' => array(0, 1)))
 	 */
 	public static function ajaxfield($selector='#jform_tags', $allowCustom = true)
 	{
-
 		// Get the component parameters
 		$params = JComponentHelper::getParams("com_tags");
-		$minTermLength = (int) $params->get("min_term_length");
+		$minTermLength = (int) $params->get("min_term_length", 3);
 
 		// Tags field ajax
 		$chosenAjaxSettings = new JRegistry(
@@ -193,8 +192,8 @@ public static function ajaxfield($selector='#jform_tags', $allowCustom = true)
 						// Method to add tags pressing enter
 						$('" . $selector . "_chzn input').keyup(function(event) {
 
-							// Tag is greater than 3 chars and enter pressed
-							if (this.value.length >= " . $minTermLength . " && (event.which === 13 || event.which === 188)) {
+							// Tag is greater than the minimum required chars and enter pressed
+							if (this.value && this.value.length >= " . $minTermLength . " && (event.which === 13 || event.which === 188)) {
 
 								// Search an highlighted result
 								var highlighted = $('" . $selector . "_chzn').find('li.active-result.highlighted').first();
diff --git a/libraries/cms/language/associations.php b/libraries/cms/language/associations.php
index 1c7bdcc713be3..0bd0d04fd9e2b 100644
--- a/libraries/cms/language/associations.php
+++ b/libraries/cms/language/associations.php
@@ -65,7 +65,10 @@ public static function getAssociations($extension, $tablename, $context, $id, $p
 		// Use catid field ?
 		if (!empty($catField))
 		{
-			$query->join('INNER', $db->quoteName('#__categories', 'ca') . ' ON ' . $db->quoteName('c2.' . $catField) . ' = ca.id AND ca.extension = ' . $db->quote($extension))
+			$query->join(
+					'INNER',
+					$db->quoteName('#__categories', 'ca') . ' ON ' . $db->quoteName('c2.' . $catField) . ' = ca.id AND ca.extension = ' . $db->quote($extension)
+				)
 				->select(
 					$query->concatenate(
 						array('ca.id', 'ca.alias'),
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 21166fddb00b5..aa6995db67385 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -255,6 +255,8 @@ protected function parseSefRoute(&$uri)
 
 				// Set the active menu item
 				$menu->setActive($vars['Itemid']);
+
+				$this->setVars($vars);
 			}
 
 			return $vars;
@@ -579,14 +581,11 @@ protected function processBuildRules(&$uri)
 
 		if ($this->_mode == JROUTER_MODE_SEF && $route)
 		{
-			$limitstart = (int) $uri->getVar('limitstart');
-
-			if ($limitstart > 0)
+			if ($limitstart = $uri->getVar('limitstart'))
 			{
-				$uri->setVar('start', $limitstart);
+				$uri->setVar('start', (int) $limitstart);
+				$uri->delVar('limitstart');
 			}
-
-			$uri->delVar('limitstart');
 		}
 
 		$uri->setPath($route);
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index e6c1d97ee0e42..8bbe5427f047e 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -47,7 +47,16 @@ class JTableContenthistory extends JTable
 	public function __construct($db)
 	{
 		parent::__construct('#__ucm_history', 'version_id', $db);
-		$this->ignoreChanges = array('modified_by', 'modified_user_id', 'modified', 'modified_time', 'checked_out', 'checked_out_time', 'version', 'hits', 'path');
+		$this->ignoreChanges = array(
+			'modified_by',
+			'modified_user_id',
+			'modified',
+			'modified_time',
+			'checked_out',
+			'checked_out_time',
+			'version',
+			'hits',
+			'path');
 		$this->convertToInt = array('publish_up', 'publish_down', 'ordering', 'featured');
 	}
 
diff --git a/libraries/cms/table/contenttype.php b/libraries/cms/table/contenttype.php
index a697f54b268e1..1e5c8d4b74c79 100644
--- a/libraries/cms/table/contenttype.php
+++ b/libraries/cms/table/contenttype.php
@@ -121,6 +121,8 @@ public function getTypeId($typeAlias)
 	 * @return  mixed  JTable object on success, otherwise false.
 	 *
 	 * @since   3.2
+	 *
+	 * @throws  RuntimeException
 	 */
 	public function getContentTable()
 	{
@@ -137,8 +139,6 @@ public function getContentTable()
 				{
 					// This isn't an instance of JTableInterface. Abort.
 					throw new RuntimeException('Class must be an instance of JTableInterface');
-
-					return false;
 				}
 
 				$result = $class::getInstance($tableInfo->special->type, $tableInfo->special->prefix);
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
index 506c7c6cb49b4..c03a36b86bb0f 100644
--- a/libraries/cms/table/corecontent.php
+++ b/libraries/cms/table/corecontent.php
@@ -186,6 +186,7 @@ public function deleteByContentId($contentItemId = null, $typeAlias = null)
 		{
 			throw new UnexpectedValueException('Null content item key not allowed.');
 		}
+
 		if ($typeAlias === null)
 		{
 			throw new UnexpectedValueException('Null type alias not allowed.');
@@ -355,7 +356,11 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		if (property_exists($this, 'core_checked_out_user_id') && property_exists($this, 'core_checked_out_time'))
 		{
 			$checkin = true;
-			$query->where(' (' . $this->_db->quoteName('core_checked_out_user_id') . ' = 0 OR ' . $this->_db->quoteName('core_checked_out_user_id') . ' = ' . (int) $userId . ')');
+			$query->where(
+				' ('
+				. $this->_db->quoteName('core_checked_out_user_id') . ' = 0 OR ' . $this->_db->quoteName('core_checked_out_user_id') . ' = ' . (int) $userId
+				. ')'
+			);
 		}
 
 		$this->_db->setQuery($query);
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index 5c9117aa421cd..343c908b1b99b 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -25,7 +25,7 @@ final class JVersion
 	public $RELEASE = '3.3';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '4-dev';
+	public $DEV_LEVEL = '7-dev';
 
 	/** @var  string  Development STATUS. */
 	public $DEV_STATUS = 'Development';
@@ -37,10 +37,10 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '25-July-2014';
+	public $RELDATE = '01-October-2014';
 
 	/** @var  string  Release time. */
-	public $RELTIME = '13:00';
+	public $RELTIME = '02:00';
 
 	/** @var  string  Release timezone. */
 	public $RELTZ = 'GMT';
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
index 1615ab6ca7e0c..db23b2962e71d 100644
--- a/libraries/import.legacy.php
+++ b/libraries/import.legacy.php
@@ -22,6 +22,7 @@
 {
 	define('IS_WIN', ($os === 'WIN') ? true : false);
 }
+
 if (!defined('IS_UNIX'))
 {
 	define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')) ? true : false);
diff --git a/libraries/import.php b/libraries/import.php
index ab757f3204031..2456d09f1091d 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -22,6 +22,7 @@
 {
 	define('IS_WIN', ($os === 'WIN') ? true : false);
 }
+
 if (!defined('IS_UNIX'))
 {
 	define('IS_UNIX', (IS_WIN === false) ? true : false);
diff --git a/libraries/joomla/access/rule.php b/libraries/joomla/access/rule.php
index 233e09dbb7b2a..7b6a26aa51476 100644
--- a/libraries/joomla/access/rule.php
+++ b/libraries/joomla/access/rule.php
@@ -155,7 +155,6 @@ public function allow($identities)
 						break;
 					}
 				}
-
 			}
 		}
 
diff --git a/libraries/joomla/access/rules.php b/libraries/joomla/access/rules.php
index 7a99dd59647ab..1492bdbcc25c8 100644
--- a/libraries/joomla/access/rules.php
+++ b/libraries/joomla/access/rules.php
@@ -194,6 +194,7 @@ public function getAllowed($identity)
 				$allowed->set($name, true);
 			}
 		}
+
 		return $allowed;
 	}
 
diff --git a/libraries/joomla/application/daemon.php b/libraries/joomla/application/daemon.php
index c3005e5031c75..089ac6e314fa5 100644
--- a/libraries/joomla/application/daemon.php
+++ b/libraries/joomla/application/daemon.php
@@ -564,7 +564,6 @@ protected function daemonize()
 		// Attempt to change the identity of user running the process.
 		if (!$this->changeIdentity())
 		{
-
 			// If the identity change was required then we need to return false.
 			if ($this->config->get('application_require_identity'))
 			{
diff --git a/libraries/joomla/application/route.php b/libraries/joomla/application/route.php
index 7d5372e446137..91957ad5ab1dc 100644
--- a/libraries/joomla/application/route.php
+++ b/libraries/joomla/application/route.php
@@ -27,16 +27,16 @@ class JRoute
 	private static $_router = null;
 
 	/**
-	 * Translates an internal Joomla URL to a humanly readible URL.
+	 * Translates an internal Joomla URL to a humanly readable URL.
 	 *
 	 * @param   string   $url    Absolute or Relative URI to Joomla resource.
-	 * @param   boolean  $xhtml  Replace & by &amp; for XML compilance.
+	 * @param   boolean  $xhtml  Replace & by &amp; for XML compliance.
 	 * @param   integer  $ssl    Secure state for the resolved URI.
 	 *                             0: (default) No change, use the protocol currently used in the request
 	 *                             1: Make URI secure using global secure site URI.
 	 *                             2: Make URI unsecure using the global unsecure site URI.
 	 *
-	 * @return  The translated humanly readible URL.
+	 * @return string The translated humanly readable URL.
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index e9dd0fa7254f7..b22e4d5fe3213 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -1154,6 +1154,7 @@ protected function loadSystemUris($requestUri = null)
 			// Remove the index.php portion of the path.
 			$path = substr_replace($path, '', strpos($path, 'index.php'), 9);
 		}
+
 		$path = rtrim($path, '/\\');
 
 		// Set the base URI both as just a path and as the full URI.
diff --git a/libraries/joomla/archive/bzip2.php b/libraries/joomla/archive/bzip2.php
index ab558a4c7206f..d7375349151a8 100644
--- a/libraries/joomla/archive/bzip2.php
+++ b/libraries/joomla/archive/bzip2.php
@@ -100,7 +100,6 @@ public function extract($archive, $destination, array $options = array ())
 					throw new RuntimeException('Unable to write archive');
 				}
 			}
-
 		}
 		else
 		{
@@ -159,6 +158,7 @@ public function extract($archive, $destination, array $options = array ())
 					}
 				}
 			}
+
 			while ($this->_data);
 
 			$output->close();
diff --git a/libraries/joomla/archive/gzip.php b/libraries/joomla/archive/gzip.php
index 7a1c32e423589..2faa4d78c13db 100644
--- a/libraries/joomla/archive/gzip.php
+++ b/libraries/joomla/archive/gzip.php
@@ -170,11 +170,13 @@ public function extract($archive, $destination, array $options = array ())
 					}
 				}
 			}
+
 			while ($this->_data);
 
 			$output->close();
 			$input->close();
 		}
+
 		return true;
 	}
 
diff --git a/libraries/joomla/archive/tar.php b/libraries/joomla/archive/tar.php
index 1940843dc96df..3c277c39288e8 100644
--- a/libraries/joomla/archive/tar.php
+++ b/libraries/joomla/archive/tar.php
@@ -115,6 +115,7 @@ public function extract($archive, $destination, array $options = array())
 						throw new RuntimeException('Unable to create destination');
 					}
 				}
+
 				if (JFile::write($path, $buffer) === false)
 				{
 					if (class_exists('JError'))
@@ -128,6 +129,7 @@ public function extract($archive, $destination, array $options = array())
 				}
 			}
 		}
+
 		return true;
 	}
 
@@ -223,9 +225,11 @@ protected function _getTarInfo(& $data)
 				{
 					/* Some other type. */
 				}
+
 				$return_array[] = $file;
 			}
 		}
+
 		$this->_metadata = $return_array;
 
 		return true;
diff --git a/libraries/joomla/archive/zip.php b/libraries/joomla/archive/zip.php
index fade1738c1d6d..831ccbcdd3090 100644
--- a/libraries/joomla/archive/zip.php
+++ b/libraries/joomla/archive/zip.php
@@ -403,6 +403,7 @@ private function _readZipInfo(&$data)
 		{
 			$last = $fhLast;
 		}
+
 		while (($fhLast = strpos($data, $this->_ctrlDirEnd, $fhLast + 1)) !== false);
 
 		// Find the central directory offset
@@ -502,6 +503,7 @@ private function _readZipInfo(&$data)
 			// Bump the max execution time because not using the built in php zip libs makes this process slow.
 			@set_time_limit(ini_get('max_execution_time'));
 		}
+
 		while ((($fhStart = strpos($data, $this->_ctrlDirHeader, $fhStart + 46)) !== false));
 
 		$this->_metadata = array_values($entries);
diff --git a/libraries/joomla/cache/cache.php b/libraries/joomla/cache/cache.php
index fb3eb8bdb945f..f663dbdca59c4 100644
--- a/libraries/joomla/cache/cache.php
+++ b/libraries/joomla/cache/cache.php
@@ -184,10 +184,12 @@ public function get($id, $group = null)
 
 		// Get the storage
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception) && $this->_options['caching'])
 		{
 			return $handler->get($id, $group, $this->_options['checkTime']);
 		}
+
 		return false;
 	}
 
@@ -202,10 +204,12 @@ public function getAll()
 	{
 		// Get the storage
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception) && $this->_options['caching'])
 		{
 			return $handler->getAll();
 		}
+
 		return false;
 	}
 
@@ -227,11 +231,14 @@ public function store($data, $id, $group = null)
 
 		// Get the storage and store the cached data
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception) && $this->_options['caching'])
 		{
 			$handler->_lifetime = $this->_options['lifetime'];
+
 			return $handler->store($id, $group, $data);
 		}
+
 		return false;
 	}
 
@@ -252,10 +259,12 @@ public function remove($id, $group = null)
 
 		// Get the storage
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception))
 		{
 			return $handler->remove($id, $group);
 		}
+
 		return false;
 	}
 
@@ -279,10 +288,12 @@ public function clean($group = null, $mode = 'group')
 
 		// Get the storage handler
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception))
 		{
 			return $handler->clean($group, $mode);
 		}
+
 		return false;
 	}
 
@@ -297,10 +308,12 @@ public function gc()
 	{
 		// Get the storage handler
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception))
 		{
 			return $handler->gc();
 		}
+
 		return false;
 	}
 
@@ -329,9 +342,11 @@ public function lock($id, $group = null, $locktime = null)
 		// Allow storage handlers to perform locking on their own
 		// NOTE drivers with lock need also unlock or unlocking will fail because of false $id
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception) && $this->_options['locking'] == true && $this->_options['caching'] == true)
 		{
 			$locked = $handler->lock($id, $group, $locktime);
+
 			if ($locked !== false)
 			{
 				return $locked;
@@ -350,7 +365,6 @@ public function lock($id, $group = null, $locktime = null)
 		if ($this->_options['locking'] == true && $this->_options['caching'] == true)
 		{
 			$data_lock = $this->get($id2, $group);
-
 		}
 		else
 		{
@@ -366,7 +380,6 @@ public function lock($id, $group = null, $locktime = null)
 			// That implies that data get from other thread has finished
 			while ($data_lock !== false)
 			{
-
 				if ($lock_counter > $looptime)
 				{
 					$returning->locked = false;
@@ -410,9 +423,11 @@ public function unlock($id, $group = null)
 
 		// Allow handlers to perform unlocking on their own
 		$handler = $this->_getStorage();
+
 		if (!($handler instanceof Exception) && $this->_options['caching'])
 		{
 			$unlocked = $handler->unlock($id, $group);
+
 			if ($unlocked !== false)
 			{
 				return $unlocked;
@@ -445,6 +460,7 @@ public function &_getStorage()
 		}
 
 		self::$_handler[$hash] = JCacheStorage::getInstance($this->_options['storage'], $this->_options);
+
 		return self::$_handler[$hash];
 	}
 
@@ -502,7 +518,7 @@ public static function getWorkarounds($data, $options = array())
 		// Set cached headers.
 		if (isset($data['headers']) && $data['headers'])
 		{
-			foreach($data['headers'] as $header)
+			foreach ($data['headers'] as $header)
 			{
 				$app->setHeader($header['name'], $header['value']);
 			}
@@ -570,6 +586,7 @@ public static function setWorkarounds($data, $options = array())
 		{
 			// Get the modules buffer before component execution.
 			$buffer1 = $document->getBuffer();
+
 			if (!is_array($buffer1))
 			{
 				$buffer1 = array();
@@ -588,7 +605,6 @@ public static function setWorkarounds($data, $options = array())
 		// Document head data
 		if ($loptions['nohead'] != 1 && method_exists($document, 'getHeadData'))
 		{
-
 			if ($loptions['modulemode'] == 1)
 			{
 				$headnow = $document->getHeadData();
@@ -622,6 +638,7 @@ public static function setWorkarounds($data, $options = array())
 								if (isset($options['headerbefore'][$now][strtolower($type)]))
 								{
 									$oldScriptStr = $options['headerbefore'][$now][strtolower($type)];
+
 									if ($oldScriptStr != $currentScriptStr)
 									{
 										// Save only the appended declaration.
@@ -641,7 +658,6 @@ public static function setWorkarounds($data, $options = array())
 						$cached['head'][$now] = $newvalue;
 					}
 				}
-
 			}
 			else
 			{
@@ -664,6 +680,7 @@ public static function setWorkarounds($data, $options = array())
 			// @todo Check if the following is needed, seems like it should be in page cache
 			// Get the module buffer after component execution.
 			$buffer2 = $document->getBuffer();
+
 			if (!is_array($buffer2))
 			{
 				$buffer2 = array();
@@ -716,9 +733,9 @@ public static function makeId()
 			'tpl' 		=> 'CMD',
 			'id' 		=> 'INT'
 		);
-		
+
 		// Use platform defaults if parameter doesn't already exist.
-		foreach($defaulturlparams as $param => $type)
+		foreach ($defaulturlparams as $param => $type)
 		{
 			if (!property_exists($registeredurlparams, $param))
 			{
@@ -754,11 +771,13 @@ public static function addIncludePath($path = '')
 		{
 			$paths = array();
 		}
+
 		if (!empty($path) && !in_array($path, $paths))
 		{
 			jimport('joomla.filesystem.path');
 			array_unshift($paths, JPath::clean($path));
 		}
+
 		return $paths;
 	}
 }
diff --git a/libraries/joomla/cache/controller.php b/libraries/joomla/cache/controller.php
index d53e2f11cb4b3..f347fd5d47595 100644
--- a/libraries/joomla/cache/controller.php
+++ b/libraries/joomla/cache/controller.php
@@ -69,6 +69,7 @@ public function __construct($options)
 	public function __call($name, $arguments)
 	{
 		$nazaj = call_user_func_array(array($this->cache, $name), $arguments);
+
 		return $nazaj;
 	}
 
@@ -155,11 +156,13 @@ public static function addIncludePath($path = '')
 		{
 			$paths = array();
 		}
+
 		if (!empty($path) && !in_array($path, $paths))
 		{
 			jimport('joomla.filesystem.path');
 			array_unshift($paths, JPath::clean($path));
 		}
+
 		return $paths;
 	}
 
@@ -183,10 +186,12 @@ public function get($id, $group = null)
 			$locktest->locked = null;
 			$locktest->locklooped = null;
 			$locktest = $this->cache->lock($id, $group);
+
 			if ($locktest->locked == true && $locktest->locklooped == true)
 			{
 				$data = $this->cache->get($id, $group);
 			}
+
 			if ($locktest->locked == true)
 			{
 				$this->cache->unlock($id, $group);
@@ -199,6 +204,7 @@ public function get($id, $group = null)
 			// Trim to fix unserialize errors
 			$data = unserialize(trim($data));
 		}
+
 		return $data;
 	}
 
diff --git a/libraries/joomla/cache/controller/callback.php b/libraries/joomla/cache/controller/callback.php
index 680ab0f77ef8f..fea6fe46813c3 100644
--- a/libraries/joomla/cache/controller/callback.php
+++ b/libraries/joomla/cache/controller/callback.php
@@ -48,7 +48,7 @@ public function call()
 	 *
 	 * @param   mixed    $callback    Callback or string shorthand for a callback
 	 * @param   array    $args        Callback arguments
-	 * @param   string   $id          Cache id
+	 * @param   mixed    $id          Cache id
 	 * @param   boolean  $wrkarounds  True to use wrkarounds
 	 * @param   array    $woptions    Workaround options
 	 *
@@ -58,7 +58,6 @@ public function call()
 	 */
 	public function get($callback, $args = array(), $id = false, $wrkarounds = false, $woptions = array())
 	{
-
 		// Normalize callback
 		if (is_array($callback))
 		{
@@ -103,6 +102,7 @@ public function get($callback, $args = array(), $id = false, $wrkarounds = false
 		if ($data === false)
 		{
 			$locktest = $this->cache->lock($id);
+
 			if ($locktest->locked == true && $locktest->locklooped == true)
 			{
 				$data = $this->cache->get($id);
@@ -113,20 +113,18 @@ public function get($callback, $args = array(), $id = false, $wrkarounds = false
 
 		if ($data !== false)
 		{
-
 			$cached = unserialize(trim($data));
 			$coptions['mergehead'] = isset($woptions['mergehead']) ? $woptions['mergehead'] : 0;
 			$output = ($wrkarounds == false) ? $cached['output'] : JCache::getWorkarounds($cached['output'], $coptions);
 			$result = $cached['result'];
+
 			if ($locktest->locked == true)
 			{
 				$this->cache->unlock($id);
 			}
-
 		}
 		else
 		{
-
 			if (!is_array($args))
 			{
 				$Args = !empty($args) ? array(&$args) : array();
@@ -171,6 +169,7 @@ public function get($callback, $args = array(), $id = false, $wrkarounds = false
 
 			// Store the cache data
 			$this->cache->store(serialize($cached), $id);
+
 			if ($locktest->locked == true)
 			{
 				$this->cache->unlock($id);
@@ -178,6 +177,7 @@ public function get($callback, $args = array(), $id = false, $wrkarounds = false
 		}
 
 		echo $output;
+
 		return $result;
 	}
 
diff --git a/libraries/joomla/cache/controller/output.php b/libraries/joomla/cache/controller/output.php
index 872bd9242953c..49cfc33ef82a5 100644
--- a/libraries/joomla/cache/controller/output.php
+++ b/libraries/joomla/cache/controller/output.php
@@ -64,6 +64,7 @@ public function start($id, $group = null)
 		if ($data === false)
 		{
 			$this->_locktest = $this->cache->lock($id, $group);
+
 			if ($this->_locktest->locked == true && $this->_locktest->locklooped == true)
 			{
 				$data = $this->cache->get($id, $group);
@@ -74,10 +75,12 @@ public function start($id, $group = null)
 		{
 			$data = unserialize(trim($data));
 			echo $data;
+
 			if ($this->_locktest->locked == true)
 			{
 				$this->cache->unlock($id, $group);
 			}
+
 			return true;
 		}
 		else
@@ -87,6 +90,7 @@ public function start($id, $group = null)
 			{
 				$this->_locktest = $this->cache->lock($id, $group);
 			}
+
 			ob_start();
 			ob_implicit_flush(false);
 
diff --git a/libraries/joomla/cache/controller/page.php b/libraries/joomla/cache/controller/page.php
index 3406919f67de4..d7f6cb93bd7cf 100644
--- a/libraries/joomla/cache/controller/page.php
+++ b/libraries/joomla/cache/controller/page.php
@@ -39,8 +39,8 @@ class JCacheControllerPage extends JCacheController
 	/**
 	 * Get the cached page data
 	 *
-	 * @param   string   $id          The cache data id
-	 * @param   string   $group       The cache data group
+	 * @param   boolean  $id     The cache data id
+	 * @param   string   $group  The cache data group
 	 *
 	 * @return  boolean  True if the cache is hit (false else)
 	 *
@@ -58,9 +58,11 @@ public function get($id = false, $group = 'page')
 		if (!headers_sent() && isset($_SERVER['HTTP_IF_NONE_MATCH']))
 		{
 			$etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+
 			if ($etag == $id)
 			{
 				$browserCache = isset($this->options['browsercache']) ? $this->options['browsercache'] : false;
+
 				if ($browserCache)
 				{
 					$this->_noChange();
@@ -78,6 +80,7 @@ public function get($id = false, $group = 'page')
 		if ($data === false)
 		{
 			$this->_locktest = $this->cache->lock($id, $group);
+
 			if ($this->_locktest->locked == true && $this->_locktest->locklooped == true)
 			{
 				$data = $this->cache->get($id, $group);
@@ -91,10 +94,12 @@ public function get($id = false, $group = 'page')
 			$data = JCache::getWorkarounds($data);
 
 			$this->_setEtag($id);
+
 			if ($this->_locktest->locked == true)
 			{
 				$this->cache->unlock($id, $group);
 			}
+
 			return $data;
 		}
 
@@ -130,6 +135,7 @@ public function store($data, $id, $group = null, $wrkarounds = true)
 		{
 			$id = $this->_id;
 		}
+
 		if (empty($group))
 		{
 			$group = $this->_group;
@@ -138,13 +144,16 @@ public function store($data, $id, $group = null, $wrkarounds = true)
 		// Only attempt to store if page data exists
 		if ($data)
 		{
-			if ($wrkarounds) {
-				$data = JCache::setWorkarounds($data, array(
-					'nopathway' => 1,
-					'nohead' 	=> 1,
-					'nomodules' => 1,
-					'headers' 	=> true
-				));
+			if ($wrkarounds)
+			{
+				$data = JCache::setWorkarounds(
+					$data, array(
+						'nopathway' => 1,
+						'nohead' 	=> 1,
+						'nomodules' => 1,
+						'headers' 	=> true
+					)
+				);
 			}
 
 			if ($this->_locktest->locked == false)
@@ -161,6 +170,7 @@ public function store($data, $id, $group = null, $wrkarounds = true)
 
 			return $sucess;
 		}
+
 		return false;
 	}
 
diff --git a/libraries/joomla/cache/controller/view.php b/libraries/joomla/cache/controller/view.php
index 33fa59a7dac5d..f636c7df5db75 100644
--- a/libraries/joomla/cache/controller/view.php
+++ b/libraries/joomla/cache/controller/view.php
@@ -21,16 +21,16 @@ class JCacheControllerView extends JCacheController
 	/**
 	 * Get the cached view data
 	 *
-	 * @param   object   &$view       The view object to cache output for
+	 * @param   object   $view        The view object to cache output for
 	 * @param   string   $method      The method name of the view method to cache output for
-	 * @param   string   $id          The cache data id
+	 * @param   mixed    $id          The cache data id
 	 * @param   boolean  $wrkarounds  True to enable workarounds.
 	 *
 	 * @return  boolean  True if the cache is hit (false else)
 	 *
 	 * @since   11.1
 	 */
-	public function get( $view, $method = 'display' , $id = false, $wrkarounds = true )
+	public function get($view, $method = 'display', $id = false, $wrkarounds = true)
 	{
 		// If an id is not given generate it from the request
 		if ($id == false)
@@ -70,7 +70,7 @@ public function get( $view, $method = 'display' , $id = false, $wrkarounds = tru
 			else
 			{
 				// No workarounds, so all data is stored in one piece
-				echo (isset($data)) ? $data : null;
+				echo isset($data) ? $data : null;
 			}
 
 			if ($locktest->locked == true)
@@ -115,6 +115,7 @@ public function get( $view, $method = 'display' , $id = false, $wrkarounds = tru
 				$this->cache->unlock($id);
 			}
 		}
+
 		return false;
 	}
 
diff --git a/libraries/joomla/cache/storage.php b/libraries/joomla/cache/storage.php
index 3ff9e9450f957..babf70c6879b3 100644
--- a/libraries/joomla/cache/storage.php
+++ b/libraries/joomla/cache/storage.php
@@ -88,7 +88,6 @@ public function __construct($options = array())
 		{
 			$this->_threshold = $this->_now - $this->_lifetime;
 		}
-
 	}
 
 	/**
@@ -114,6 +113,7 @@ public static function getInstance($handler = null, $options = array())
 		{
 			$conf = JFactory::getConfig();
 			$handler = $conf->get('cache_handler');
+
 			if (empty($handler))
 			{
 				throw new UnexpectedValueException('Cache Storage Handler not set.');
@@ -131,10 +131,12 @@ public static function getInstance($handler = null, $options = array())
 		$handler = strtolower(preg_replace('/[^A-Z0-9_\.-]/i', '', $handler));
 
 		$class = 'JCacheStorage' . ucfirst($handler);
+
 		if (!class_exists($class))
 		{
 			// Search for the class file in the JCacheStorage include paths.
 			jimport('joomla.filesystem.path');
+
 			if ($path = JPath::find(self::addIncludePath(), strtolower($handler) . '.php'))
 			{
 				include_once $path;
@@ -178,6 +180,7 @@ public function getAll()
 		{
 			include_once JPATH_PLATFORM . '/joomla/cache/storage/helper.php';
 		}
+
 		return;
 	}
 
@@ -313,6 +316,7 @@ protected function _getCacheId($id, $group)
 	{
 		$name = md5($this->_application . '-' . $id . '-' . $this->_language);
 		$this->rawname = $this->_hash . '-' . $name;
+
 		return $this->_hash . '-cache-' . $group . '-' . $name;
 	}
 
diff --git a/libraries/joomla/cache/storage/apc.php b/libraries/joomla/cache/storage/apc.php
index 552c86378b82f..6384ecb56571b 100644
--- a/libraries/joomla/cache/storage/apc.php
+++ b/libraries/joomla/cache/storage/apc.php
@@ -33,6 +33,7 @@ class JCacheStorageApc extends JCacheStorage
 	public function get($id, $group, $checkTime = true)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
+
 		return apc_fetch($cache_id);
 	}
 
@@ -55,7 +56,6 @@ public function getAll()
 
 		foreach ($keys as $key)
 		{
-
 			$name = $key['info'];
 			$namearr = explode('-', $name);
 
@@ -95,6 +95,7 @@ public function getAll()
 	public function store($id, $group, $data)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
+
 		return apc_store($cache_id, $data, $this->_lifetime);
 	}
 
@@ -111,6 +112,7 @@ public function store($id, $group, $data)
 	public function remove($id, $group)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
+
 		return apc_delete($cache_id);
 	}
 
@@ -135,12 +137,12 @@ public function clean($group, $mode = null)
 
 		foreach ($keys as $key)
 		{
-
 			if (strpos($key['info'], $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
 			{
 				apc_delete($key['info']);
 			}
 		}
+
 		return true;
 	}
 
@@ -202,14 +204,12 @@ public function lock($id, $group, $locktime)
 
 		if ($data_lock === false)
 		{
-
 			$lock_counter = 0;
 
 			// Loop until you find that the lock has been released.
 			// That implies that data get from other thread has finished
 			while ($data_lock === false)
 			{
-
 				if ($lock_counter > $looptime)
 				{
 					$returning->locked = false;
@@ -221,8 +221,8 @@ public function lock($id, $group, $locktime)
 				$data_lock = apc_add($cache_id, 1, $locktime);
 				$lock_counter++;
 			}
-
 		}
+
 		$returning->locked = $data_lock;
 
 		return $returning;
@@ -243,6 +243,7 @@ public function unlock($id, $group = null)
 		$cache_id = $this->_getCacheId($id, $group) . '_lock';
 
 		$unlock = apc_delete($cache_id);
+
 		return $unlock;
 	}
 }
diff --git a/libraries/joomla/cache/storage/file.php b/libraries/joomla/cache/storage/file.php
index 530e5431a0c48..cf8c12ebaaab9 100644
--- a/libraries/joomla/cache/storage/file.php
+++ b/libraries/joomla/cache/storage/file.php
@@ -63,6 +63,7 @@ public function get($id, $group, $checkTime = true)
 			if (file_exists($path))
 			{
 				$data = file_get_contents($path);
+
 				if ($data)
 				{
 					// Remove the initial die() statement
@@ -102,6 +103,7 @@ public function getAll()
 			{
 				$item->updateSize(filesize($path . '/' . $folder . '/' . $file) / 1024);
 			}
+
 			$data[$folder] = $item;
 		}
 
@@ -161,10 +163,12 @@ public function store($id, $group, $data)
 	public function remove($id, $group)
 	{
 		$path = $this->_getFilePath($id, $group);
+
 		if (!@unlink($path))
 		{
 			return false;
 		}
+
 		return true;
 	}
 
@@ -194,6 +198,7 @@ public function clean($group, $mode = null)
 		{
 			case 'notgroup':
 				$folders = $this->_folders($this->_root);
+
 				for ($i = 0, $n = count($folders); $i < $n; $i++)
 				{
 					if ($folders[$i] != $folder)
@@ -210,6 +215,7 @@ public function clean($group, $mode = null)
 				}
 				break;
 		}
+
 		return $return;
 	}
 
@@ -226,14 +232,17 @@ public function gc()
 
 		// Files older than lifeTime get deleted from cache
 		$files = $this->_filesInFolder($this->_root, '', true, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX', 'index.html'));
+
 		foreach ($files as $file)
 		{
 			$time = @filemtime($file);
+
 			if (($time + $this->_lifetime) < $this->_now || empty($time))
 			{
 				$result |= @unlink($file);
 			}
 		}
+
 		return $result;
 	}
 
@@ -247,6 +256,7 @@ public function gc()
 	public static function isSupported()
 	{
 		$conf = JFactory::getConfig();
+
 		return is_writable($conf->get('cache_path', JPATH_CACHE));
 	}
 
@@ -282,14 +292,12 @@ public function lock($id, $group, $locktime)
 
 		if ($data_lock === false)
 		{
-
 			$lock_counter = 0;
 
 			// Loop until you find that the lock has been released.
 			// That implies that data get from other thread has finished
 			while ($data_lock === false)
 			{
-
 				if ($lock_counter > $looptime)
 				{
 					$returning->locked = false;
@@ -301,8 +309,8 @@ public function lock($id, $group, $locktime)
 				$data_lock = @flock($_fileopen, LOCK_EX);
 				$lock_counter++;
 			}
-
 		}
+
 		$returning->locked = $data_lock;
 
 		return $returning;
@@ -351,13 +359,17 @@ protected function _checkExpire($id, $group)
 		if (file_exists($path))
 		{
 			$time = @filemtime($path);
+
 			if (($time + $this->_lifetime) < $this->_now || empty($time))
 			{
 				@unlink($path);
+
 				return false;
 			}
+
 			return true;
 		}
+
 		return false;
 	}
 
@@ -379,7 +391,6 @@ protected function _getFilePath($id, $group)
 		// If the folder doesn't exist try to create it
 		if (!is_dir($dir))
 		{
-
 			// Make sure the index file is there
 			$indexFile = $dir . '/index.html';
 			@ mkdir($dir) && file_put_contents($indexFile, '<!DOCTYPE html><title></title>');
@@ -390,6 +401,7 @@ protected function _getFilePath($id, $group)
 		{
 			return false;
 		}
+
 		return $dir . '/' . $name . '.php';
 	}
 
@@ -409,6 +421,7 @@ protected function _deleteFolder($path)
 		{
 			// Bad programmer! Bad, bad programmer!
 			JLog::add('JCacheStorageFile::_deleteFolder ' . JText::_('JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY'), JLog::WARNING, 'jerror');
+
 			return false;
 		}
 
@@ -420,6 +433,7 @@ protected function _deleteFolder($path)
 		if ($pos === false || $pos > 0)
 		{
 			JLog::add('JCacheStorageFile::_deleteFolder' . JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), JLog::WARNING, 'jerror');
+
 			return false;
 		}
 
@@ -435,7 +449,6 @@ protected function _deleteFolder($path)
 		}
 		elseif (!empty($files) && is_array($files))
 		{
-
 			foreach ($files as $file)
 			{
 				$file = $this->_cleanPath($file);
@@ -450,6 +463,7 @@ protected function _deleteFolder($path)
 				{
 					$filename = basename($file);
 					JLog::add('JCacheStorageFile::_deleteFolder' . JText::sprintf('JLIB_FILESYSTEM_DELETE_FAILED', $filename), JLog::WARNING, 'jerror');
+
 					return false;
 				}
 			}
@@ -485,6 +499,7 @@ protected function _deleteFolder($path)
 			JLog::add('JCacheStorageFile::_deleteFolder' . JText::sprintf('JLIB_FILESYSTEM_ERROR_FOLDER_DELETE', $path), JLog::WARNING, 'jerror');
 			$ret = false;
 		}
+
 		return $ret;
 	}
 
@@ -543,6 +558,7 @@ protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullp
 		if (!is_dir($path))
 		{
 			JLog::add('JCacheStorageFile::_filesInFolder' . JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), JLog::WARNING, 'jerror');
+
 			return false;
 		}
 
@@ -560,12 +576,14 @@ protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullp
 		{
 			$excludefilter = '';
 		}
+
 		while (($file = readdir($handle)) !== false)
 		{
 			if (($file != '.') && ($file != '..') && (!in_array($file, $exclude)) && (!$excludefilter || !preg_match($excludefilter, $file)))
 			{
 				$dir = $path . '/' . $file;
 				$isDir = is_dir($dir);
+
 				if ($isDir)
 				{
 					if ($recurse)
@@ -598,6 +616,7 @@ protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullp
 				}
 			}
 		}
+
 		closedir($handle);
 
 		return $arr;
@@ -629,6 +648,7 @@ protected function _folders($path, $filter = '.', $recurse = false, $fullpath =
 		if (!is_dir($path))
 		{
 			JLog::add('JCacheStorageFile::_folders' . JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), JLog::WARNING, 'jerror');
+
 			return false;
 		}
 
@@ -646,6 +666,7 @@ protected function _folders($path, $filter = '.', $recurse = false, $fullpath =
 		{
 			$excludefilter_string = '';
 		}
+
 		while (($file = readdir($handle)) !== false)
 		{
 			if (($file != '.') && ($file != '..')
@@ -654,6 +675,7 @@ protected function _folders($path, $filter = '.', $recurse = false, $fullpath =
 			{
 				$dir = $path . '/' . $file;
 				$isDir = is_dir($dir);
+
 				if ($isDir)
 				{
 					// Removes filtered directories
@@ -668,6 +690,7 @@ protected function _folders($path, $filter = '.', $recurse = false, $fullpath =
 							$arr[] = $file;
 						}
 					}
+
 					if ($recurse)
 					{
 						if (is_int($recurse))
@@ -684,6 +707,7 @@ protected function _folders($path, $filter = '.', $recurse = false, $fullpath =
 				}
 			}
 		}
+
 		closedir($handle);
 
 		return $arr;
diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php
index 1e5d38e88d875..64750eb225c3c 100644
--- a/libraries/joomla/cache/storage/memcache.php
+++ b/libraries/joomla/cache/storage/memcache.php
@@ -53,6 +53,7 @@ class JCacheStorageMemcache extends JCacheStorage
 	public function __construct($options = array())
 	{
 		parent::__construct($options);
+
 		if (self::$_db === null)
 		{
 			$this->getConnection();
@@ -62,7 +63,7 @@ public function __construct($options = array())
 	/**
 	 * Return memcache connection object
 	 *
-	 * @return  object   memcache connection object
+	 * @return  mixed   Memcache connection object if present
 	 *
 	 * @since   11.1
 	 * @throws  RuntimeException
@@ -92,6 +93,7 @@ protected function getConnection()
 		self::$_db->addServer($server['host'], $server['port'], $this->_persistent);
 
 		$memcachetest = @self::$_db->connect($server['host'], $server['port']);
+
 		if ($memcachetest == false)
 		{
 			throw new RuntimeException('Could not connect to memcache server', 404);
@@ -122,6 +124,7 @@ public function get($id, $group, $checkTime = true)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
 		$back = self::$_db->get($cache_id);
+
 		return $back;
 	}
 
@@ -149,11 +152,11 @@ public function getAll()
 				{
 					continue;
 				}
+
 				$namearr = explode('-', $key->name);
 
 				if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
 				{
-
 					$group = $namearr[2];
 
 					if (!isset($data[$group]))
@@ -196,6 +199,7 @@ public function store($id, $group, $data)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -207,6 +211,7 @@ public function store($id, $group, $data)
 
 		$config = JFactory::getConfig();
 		$lifetime = (int) $config->get('cachetime', 15);
+
 		if ($this->_lifetime == $lifetime)
 		{
 			$this->_lifetime = $lifetime * 60;
@@ -245,6 +250,7 @@ public function remove($id, $group)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -256,8 +262,10 @@ public function remove($id, $group)
 			{
 				unset($index[$key]);
 			}
+
 			break;
 		}
+
 		self::$_db->replace($this->_hash . '-index', $index, 0, 0);
 		$this->unlockindex();
 
@@ -284,23 +292,26 @@ public function clean($group, $mode = null)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
 		}
 
 		$secret = $this->_hash;
+
 		foreach ($index as $key => $value)
 		{
-
 			if (strpos($value->name, $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
 			{
 				self::$_db->delete($value->name, 0);
 				unset($index[$key]);
 			}
 		}
+
 		self::$_db->replace($this->_hash . '-index', $index, 0, 0);
 		$this->unlockindex();
+
 		return true;
 	}
 
@@ -361,6 +372,7 @@ public function lock($id, $group, $locktime)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -377,14 +389,12 @@ public function lock($id, $group, $locktime)
 
 		if ($data_lock === false)
 		{
-
 			$lock_counter = 0;
 
 			// Loop until you find that the lock has been released.
 			// That implies that data get from other thread has finished
 			while ($data_lock === false)
 			{
-
 				if ($lock_counter > $looptime)
 				{
 					$returning->locked = false;
@@ -396,8 +406,8 @@ public function lock($id, $group, $locktime)
 				$data_lock = self::$_db->add($cache_id . '_lock', 1, false, $locktime);
 				$lock_counter++;
 			}
-
 		}
+
 		$returning->locked = $data_lock;
 
 		return $returning;
@@ -423,6 +433,7 @@ public function unlock($id, $group = null)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -434,8 +445,10 @@ public function unlock($id, $group = null)
 			{
 				unset($index[$key]);
 			}
+
 			break;
 		}
+
 		self::$_db->replace($this->_hash . '-index', $index, 0, 0);
 		$this->unlockindex();
 
@@ -456,7 +469,6 @@ protected function lockindex()
 
 		if ($data_lock === false)
 		{
-
 			$lock_counter = 0;
 
 			// Loop until you find that the lock has been released.  that implies that data get from other thread has finished
diff --git a/libraries/joomla/cache/storage/memcached.php b/libraries/joomla/cache/storage/memcached.php
index 381028951f32d..99686fef78ce0 100644
--- a/libraries/joomla/cache/storage/memcached.php
+++ b/libraries/joomla/cache/storage/memcached.php
@@ -53,6 +53,7 @@ class JCacheStorageMemcached extends JCacheStorage
 	public function __construct($options = array())
 	{
 		parent::__construct($options);
+
 		if (self::$_db === null)
 		{
 			$this->getConnection();
@@ -97,6 +98,7 @@ protected function getConnection()
 		{
 			self::$_db = new Memcached;
 		}
+
 		$memcachedtest = self::$_db->addServer($server['host'], $server['port']);
 
 		if ($memcachedtest == false)
@@ -131,6 +133,7 @@ public function get($id, $group, $checkTime = true)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
 		$back = self::$_db->get($cache_id);
+
 		return $back;
 	}
 
@@ -158,11 +161,11 @@ public function getAll()
 				{
 					continue;
 				}
+
 				$namearr = explode('-', $key->name);
 
 				if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
 				{
-
 					$group = $namearr[2];
 
 					if (!isset($data[$group]))
@@ -205,6 +208,7 @@ public function store($id, $group, $data)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -246,6 +250,7 @@ public function remove($id, $group)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -257,8 +262,10 @@ public function remove($id, $group)
 			{
 				unset($index[$key]);
 			}
+
 			break;
 		}
+
 		self::$_db->replace($this->_hash . '-index', $index, 0);
 		$this->unlockindex();
 
@@ -285,23 +292,26 @@ public function clean($group, $mode = null)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
 		}
 
 		$secret = $this->_hash;
+
 		foreach ($index as $key => $value)
 		{
-
 			if (strpos($value->name, $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
 			{
 				self::$_db->delete($value->name, 0);
 				unset($index[$key]);
 			}
 		}
+
 		self::$_db->replace($this->_hash . '-index', $index, 0);
 		$this->unlockindex();
+
 		return true;
 	}
 
@@ -362,6 +372,7 @@ public function lock($id, $group, $locktime)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -380,14 +391,12 @@ public function lock($id, $group, $locktime)
 
 		if ($data_lock === false)
 		{
-
 			$lock_counter = 0;
 
 			// Loop until you find that the lock has been released.
 			// That implies that data get from other thread has finished
 			while ($data_lock === false)
 			{
-
 				if ($lock_counter > $looptime)
 				{
 					$returning->locked = false;
@@ -399,8 +408,8 @@ public function lock($id, $group, $locktime)
 				$data_lock = self::$_db->add($cache_id . '_lock', 1, $locktime);
 				$lock_counter++;
 			}
-
 		}
+
 		$returning->locked = $data_lock;
 
 		return $returning;
@@ -426,6 +435,7 @@ public function unlock($id, $group = null)
 		}
 
 		$index = self::$_db->get($this->_hash . '-index');
+
 		if ($index === false)
 		{
 			$index = array();
@@ -437,6 +447,7 @@ public function unlock($id, $group = null)
 			{
 				unset($index[$key]);
 			}
+
 			break;
 		}
 
@@ -460,7 +471,6 @@ protected function lockindex()
 
 		if ($data_lock === false)
 		{
-
 			$lock_counter = 0;
 
 			// Loop until you find that the lock has been released.  that implies that data get from other thread has finished
diff --git a/libraries/joomla/cache/storage/wincache.php b/libraries/joomla/cache/storage/wincache.php
index a67561bafc142..c6bd2d9c70376 100644
--- a/libraries/joomla/cache/storage/wincache.php
+++ b/libraries/joomla/cache/storage/wincache.php
@@ -19,18 +19,6 @@
  */
 class JCacheStorageWincache extends JCacheStorage
 {
-	/**
-	 * Constructor
-	 *
-	 * @param   array  $options  Optional parameters.
-	 *
-	 * @since   11.1
-	 */
-	public function __construct($options = array())
-	{
-		parent::__construct($options);
-	}
-
 	/**
 	 * Get cached data from WINCACHE by id and group
 	 *
@@ -46,6 +34,7 @@ public function get($id, $group, $checkTime = true)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
 		$cache_content = wincache_ucache_get($cache_id);
+
 		return $cache_content;
 	}
 
@@ -69,9 +58,11 @@ public function getAll()
 		{
 			$name    = $key['key_name'];
 			$namearr = explode('-', $name);
+
 			if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
 			{
 				$group = $namearr[2];
+
 				if (!isset($data[$group]))
 				{
 					$item = new JCacheStorageHelper($group);
@@ -80,6 +71,7 @@ public function getAll()
 				{
 					$item = $data[$group];
 				}
+
 				if (isset($key['value_size']))
 				{
 					$item->updateSize($key['value_size'] / 1024);
@@ -89,6 +81,7 @@ public function getAll()
 					// Dummy, WINCACHE version is too low.
 					$item->updateSize(1);
 				}
+
 				$data[$group] = $item;
 			}
 		}
@@ -110,6 +103,7 @@ public function getAll()
 	public function store($id, $group, $data)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
+
 		return wincache_ucache_set($cache_id, $data, $this->_lifetime);
 	}
 
@@ -126,6 +120,7 @@ public function store($id, $group, $data)
 	public function remove($id, $group)
 	{
 		$cache_id = $this->_getCacheId($id, $group);
+
 		return wincache_ucache_delete($cache_id);
 	}
 
@@ -154,6 +149,7 @@ public function clean($group, $mode = null)
 				wincache_ucache_delete($key['key_name']);
 			}
 		}
+
 		return true;
 	}
 
@@ -189,6 +185,7 @@ public function gc()
 	public static function isSupported()
 	{
 		$test = extension_loaded('wincache') && function_exists('wincache_ucache_get') && !strcmp(ini_get('wincache.ucenabled'), '1');
+
 		return $test;
 	}
 }
diff --git a/libraries/joomla/client/ftp.php b/libraries/joomla/client/ftp.php
index 261e971e25a26..6018f592d395b 100644
--- a/libraries/joomla/client/ftp.php
+++ b/libraries/joomla/client/ftp.php
@@ -25,14 +25,17 @@
 {
 	define('CRLF', "\r\n");
 }
+
 if (!defined("FTP_AUTOASCII"))
 {
 	define("FTP_AUTOASCII", -1);
 }
+
 if (!defined("FTP_BINARY"))
 {
 	define("FTP_BINARY", 1);
 }
+
 if (!defined("FTP_ASCII"))
 {
 	define("FTP_ASCII", 0);
@@ -143,6 +146,7 @@ public function __construct(array $options = array())
 		{
 			$options['type'] = FTP_BINARY;
 		}
+
 		$this->setOptions($options);
 
 		if (FTP_NATIVE)
@@ -232,10 +236,12 @@ public function setOptions(array $options)
 		{
 			$this->_type = $options['type'];
 		}
+
 		if (isset($options['timeout']))
 		{
 			$this->_timeout = $options['timeout'];
 		}
+
 		return true;
 	}
 
@@ -334,6 +340,7 @@ public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -404,6 +411,7 @@ public function pwd()
 
 				return false;
 			}
+
 			return $ret;
 		}
 
@@ -452,6 +460,7 @@ public function syst()
 
 				return false;
 			}
+
 			$ret = $this->_response;
 		}
 
@@ -493,6 +502,7 @@ public function chdir($path)
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -527,6 +537,7 @@ public function reinit()
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -562,6 +573,7 @@ public function rename($from, $to)
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -617,8 +629,10 @@ public function chmod($path, $mode)
 				{
 					JLog::add(JText::_('JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE_NATIVE'), JLog::WARNING, 'jerror');
 				}
+
 				return false;
 			}
+
 			return true;
 		}
 
@@ -629,8 +643,10 @@ public function chmod($path, $mode)
 			{
 				JLog::add(JText::sprintf('JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE', $this->_response, $path, $mode), JLog::WARNING, 'jerror');
 			}
+
 			return false;
 		}
+
 		return true;
 	}
 
@@ -657,6 +673,7 @@ public function delete($path)
 					return false;
 				}
 			}
+
 			return true;
 		}
 
@@ -670,6 +687,7 @@ public function delete($path)
 				return false;
 			}
 		}
+
 		return true;
 	}
 
@@ -693,6 +711,7 @@ public function mkdir($path)
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -703,6 +722,7 @@ public function mkdir($path)
 
 			return false;
 		}
+
 		return true;
 	}
 
@@ -726,6 +746,7 @@ public function restart($point)
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -771,6 +792,7 @@ public function create($path)
 
 				return false;
 			}
+
 			fclose($buffer);
 
 			return true;
@@ -848,6 +870,7 @@ public function read($remote, &$buffer)
 			{
 				$buffer .= fread($tmp, 8192);
 			}
+
 			fclose($tmp);
 
 			return true;
@@ -937,6 +960,7 @@ public function get($local, $remote)
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -1028,6 +1052,7 @@ public function store($local, $remote = null)
 
 				return false;
 			}
+
 			return true;
 		}
 
@@ -1084,6 +1109,7 @@ public function store($local, $remote = null)
 
 					return false;
 				}
+
 				$line = substr($line, $result);
 			}
 			while ($line != "");
@@ -1139,6 +1165,7 @@ public function write($remote, $buffer)
 
 				return false;
 			}
+
 			fclose($tmp);
 
 			return true;
@@ -1173,6 +1200,7 @@ public function write($remote, $buffer)
 
 				return false;
 			}
+
 			$buffer = substr($buffer, $result);
 		}
 		while ($buffer != "");
@@ -1225,10 +1253,12 @@ public function listNames($path = null)
 				{
 					return array();
 				}
+
 				JLog::add(JText::_('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE'), JLog::WARNING, 'jerror');
 
 				return false;
 			}
+
 			$list = preg_replace('#^' . preg_quote($path, '#') . '[/\\\\]?#', '', $list);
 
 			if ($keys = array_merge(array_keys($list, '.'), array_keys($list, '..')))
@@ -1238,12 +1268,11 @@ public function listNames($path = null)
 					unset($list[$key]);
 				}
 			}
+
 			return $list;
 		}
 
-		/*
-		 * If a path exists, prepend a space
-		 */
+		// If a path exists, prepend a space
 		if ($path != null)
 		{
 			$path = ' ' . $path;
@@ -1266,6 +1295,7 @@ public function listNames($path = null)
 			{
 				return array();
 			}
+
 			JLog::add(JText::sprintf('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_NLST', $this->_response, $path), JLog::WARNING, 'jerror');
 
 			return false;
@@ -1276,6 +1306,7 @@ public function listNames($path = null)
 		{
 			$data .= fread($this->_dataconn, 4096);
 		}
+
 		fclose($this->_dataconn);
 
 		// Everything go okay?
@@ -1296,6 +1327,7 @@ public function listNames($path = null)
 				unset($data[$key]);
 			}
 		}
+
 		return $data;
 	}
 
@@ -1369,6 +1401,7 @@ public function listDetails($path = null, $type = 'all')
 			{
 				$data .= fread($this->_dataconn, 4096);
 			}
+
 			fclose($this->_dataconn);
 
 			// Everything go okay?
@@ -1426,6 +1459,7 @@ public function listDetails($path = null, $type = 'all')
 				break;
 			}
 		}
+
 		if (!$osType)
 		{
 			JLog::add(JText::_('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_UNRECOGNISED'), JLog::WARNING, 'jerror');
@@ -1433,9 +1467,7 @@ public function listDetails($path = null, $type = 'all')
 			return false;
 		}
 
-		/*
-		 * Here is where it is going to get dirty....
-		 */
+		// Here is where it is going to get dirty....
 		if ($osType == 'UNIX' || $osType == 'MAC')
 		{
 			foreach ($contents as $file)
@@ -1458,16 +1490,19 @@ public function listDetails($path = null, $type = 'all')
 					$tmp_array['time'] = $regs[7];
 					$tmp_array['name'] = $regs[9];
 				}
+
 				// If we just want files, do not add a folder
 				if ($type == 'files' && $tmp_array['type'] == 1)
 				{
 					continue;
 				}
+
 				// If we just want folders, do not add a file
 				if ($type == 'folders' && $tmp_array['type'] == 0)
 				{
 					continue;
 				}
+
 				if (is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..')
 				{
 					$dir_list[] = $tmp_array;
@@ -1507,6 +1542,7 @@ public function listDetails($path = null, $type = 'all')
 				{
 					continue;
 				}
+
 				if (is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..')
 				{
 					$dir_list[] = $tmp_array;
@@ -1604,6 +1640,7 @@ protected function _verifyResponse($expected)
 				$retval = false;
 			}
 		}
+
 		return $retval;
 	}
 
@@ -1726,6 +1763,7 @@ protected function _findMode($fileName)
 		{
 			$mode = FTP_BINARY;
 		}
+
 		return $mode;
 	}
 
@@ -1759,6 +1797,7 @@ protected function _mode($mode)
 				return false;
 			}
 		}
+
 		return true;
 	}
 }
diff --git a/libraries/joomla/client/helper.php b/libraries/joomla/client/helper.php
index 175845c4953e5..3f56d4f983f31 100644
--- a/libraries/joomla/client/helper.php
+++ b/libraries/joomla/client/helper.php
@@ -113,6 +113,7 @@ public static function setCredentials($client, $user, $pass)
 						{
 							$return = true;
 						}
+
 						$ftp->quit();
 					}
 				}
diff --git a/libraries/joomla/client/ldap.php b/libraries/joomla/client/ldap.php
index 7838e08b8f9be..5cb83b8f6231a 100644
--- a/libraries/joomla/client/ldap.php
+++ b/libraries/joomla/client/ldap.php
@@ -618,6 +618,7 @@ public static function LDAPNetAddr($networkaddress)
 					$addr .= ".";
 				}
 			}
+
 			if (($addrtype == 1) || ($addrtype == 8) || ($addrtype = 9))
 			{
 				// Strip last period from end of $addr
@@ -628,6 +629,7 @@ public static function LDAPNetAddr($networkaddress)
 		{
 			$addr .= JText::_('JLIB_CLIENT_ERROR_LDAP_ADDRESS_NOT_AVAILABLE');
 		}
+
 		return array('protocol' => $addrtypes[$addrtype], 'address' => $addr);
 	}
 
diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
index 7dea0801ccfb1..d356f361fd342 100644
--- a/libraries/joomla/database/driver.php
+++ b/libraries/joomla/database/driver.php
@@ -265,7 +265,6 @@ public static function getInstance($options = array())
 		// If we already have a database connector instance for these options then just use that.
 		if (empty(self::$instances[$signature]))
 		{
-
 			// Derive the class name from the driver.
 			$class = 'JDatabaseDriver' . ucfirst(strtolower($options['driver']));
 
@@ -607,6 +606,7 @@ protected function getCreateDatabaseQuery($options, $utf)
 		{
 			return 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' CHARACTER SET `utf8`';
 		}
+
 		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
 	}
 
@@ -920,6 +920,7 @@ abstract public function getTableList();
 	public function getUTFSupport()
 	{
 		JLog::add('JDatabaseDriver::getUTFSupport() is deprecated. Use JDatabaseDriver::hasUTFSupport() instead.', JLog::WARNING, 'deprecated');
+
 		return $this->hasUTFSupport();
 	}
 
@@ -1606,6 +1607,7 @@ public function replacePrefix($sql, $prefix = '#__')
 				{
 					break;
 				}
+
 				$l = $k - 1;
 
 				while ($l >= 0 && $sql{$l} == '\\')
diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
index 96647dbbc5e42..83ea00deb4df9 100644
--- a/libraries/joomla/database/driver/mysqli.php
+++ b/libraries/joomla/database/driver/mysqli.php
@@ -105,8 +105,9 @@ public function connect()
 		 * have to extract them from the host string.
 		 */
 		$port = isset($this->options['port']) ? $this->options['port'] : 3306;
+		$regex = '/^(?P<host>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:(?P<port>.+))?$/';
 
-		if (preg_match('/^(?P<host>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:(?P<port>.+))?$/', $this->options['host'], $matches))
+		if (preg_match($regex, $this->options['host'], $matches))
 		{
 			// It's an IPv4 address with ot without port
 			$this->options['host'] = $matches['host'];
@@ -362,6 +363,7 @@ public function getTableCreate($tables)
 
 		// Sanitize input to an array and iterate over the list.
 		settype($tables, 'array');
+
 		foreach ($tables as $table)
 		{
 			// Set the query to get the table CREATE statement.
@@ -571,7 +573,11 @@ public function execute()
 				$this->callStacks[] = debug_backtrace();
 			}
 
-			$this->callStacks[count($this->callStacks) - 1][0]['memory'] = array($memoryBefore, memory_get_usage(), is_object($this->cursor) ? $this->getNumRows() : null);
+			$this->callStacks[count($this->callStacks) - 1][0]['memory'] = array(
+				$memoryBefore,
+				memory_get_usage(),
+				is_object($this->cursor) ? $this->getNumRows() : null
+			);
 		}
 
 		// If an error occurred handle it.
diff --git a/libraries/joomla/database/driver/oracle.php b/libraries/joomla/database/driver/oracle.php
index 712fbf44756f3..f48a520e1b24f 100644
--- a/libraries/joomla/database/driver/oracle.php
+++ b/libraries/joomla/database/driver/oracle.php
@@ -176,16 +176,16 @@ public function getConnectedQuery()
 	}
 
 	/**
-     * Returns the current date format
-     * This method should be useful in the case that
-     * somebody actually wants to use a different
-     * date format and needs to check what the current
-     * one is to see if it needs to be changed.
-     *
-     * @return string The current date format
-     *
-     * @since 12.1
-     */
+	 * Returns the current date format
+	 * This method should be useful in the case that
+	 * somebody actually wants to use a different
+	 * date format and needs to check what the current
+	 * one is to see if it needs to be changed.
+	 *
+	 * @return string The current date format
+	 *
+	 * @since 12.1
+	 */
 	public function getDateFormat()
 	{
 		return $this->dateformat;
@@ -216,6 +216,7 @@ public function getTableCreate($tables)
 
 		// Sanitize input to an array and iterate over the list.
 		settype($tables, 'array');
+
 		foreach ($tables as $table)
 		{
 			$query->bind(':tableName', $table);
@@ -342,6 +343,7 @@ public function getTableList($databaseName = null, $includeDatabaseName = false)
 		}
 
 		$query->from('all_tables');
+
 		if ($databaseName)
 		{
 			$query->where('owner = :database')
@@ -398,19 +400,19 @@ public function select($database)
 	}
 
 	/**
-     * Sets the Oracle Date Format for the session
-     * Default date format for Oracle is = DD-MON-RR
-     * The default date format for this driver is:
-     * 'RRRR-MM-DD HH24:MI:SS' since it is the format
-     * that matches the MySQL one used within most Joomla
-     * tables.
-     *
-     * @param   string  $dateFormat  Oracle Date Format String
-     *
-     * @return boolean
-     *
-     * @since  12.1
-     */
+	 * Sets the Oracle Date Format for the session
+	 * Default date format for Oracle is = DD-MON-RR
+	 * The default date format for this driver is:
+	 * 'RRRR-MM-DD HH24:MI:SS' since it is the format
+	 * that matches the MySQL one used within most Joomla
+	 * tables.
+	 *
+	 * @param   string  $dateFormat  Oracle Date Format String
+	 *
+	 * @return boolean
+	 *
+	 * @since  12.1
+	 */
 	public function setDateFormat($dateFormat = 'DD-MON-RR')
 	{
 		$this->connect();
@@ -423,6 +425,7 @@ public function setDateFormat($dateFormat = 'DD-MON-RR')
 		}
 
 		$this->setQuery("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = '$dateFormat'");
+
 		if (!$this->execute())
 		{
 			return false;
@@ -536,6 +539,7 @@ public function replacePrefix($query, $prefix = '#__')
 		while ($startPos < $n)
 		{
 			$ip = strpos($query, $prefix, $startPos);
+
 			if ($ip === false)
 			{
 				break;
@@ -563,31 +567,39 @@ public function replacePrefix($query, $prefix = '#__')
 			{
 				$k = strpos($query, $quoteChar, $j);
 				$escaped = false;
+
 				if ($k === false)
 				{
 					break;
 				}
+
 				$l = $k - 1;
+
 				while ($l >= 0 && $query{$l} == '\\')
 				{
 					$l--;
 					$escaped = !$escaped;
 				}
+
 				if ($escaped)
 				{
 					$j = $k + 1;
 					continue;
 				}
+
 				break;
 			}
+
 			if ($k === false)
 			{
 				// Error in the query - no end quote; ignore it
 				break;
 			}
+
 			$literal .= substr($query, $startPos, $k - $startPos + 1);
 			$startPos = $k + 1;
 		}
+
 		if ($startPos < $n)
 		{
 			$literal .= substr($query, $startPos, $n - $startPos);
diff --git a/libraries/joomla/database/driver/pdo.php b/libraries/joomla/database/driver/pdo.php
index aab088e0f5f92..b9122823fabbf 100644
--- a/libraries/joomla/database/driver/pdo.php
+++ b/libraries/joomla/database/driver/pdo.php
@@ -396,12 +396,14 @@ public function execute()
 
 		// Execute the query.
 		$this->executed = false;
+
 		if ($this->prepared instanceof PDOStatement)
 		{
 			// Bind the variables:
 			if ($this->sql instanceof JDatabaseQueryPreparable)
 			{
-				$bounded =& $this->sql->getBounded();
+				$bounded = $this->sql->getBounded();
+
 				foreach ($bounded as $key => $obj)
 				{
 					$this->prepared->bindParam($key, $obj->value, $obj->dataType, $obj->length, $obj->driverOptions);
@@ -414,6 +416,7 @@ public function execute()
 		if ($this->debug)
 		{
 			$this->timings[] = microtime(true);
+
 			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
 			{
 				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@@ -800,6 +803,7 @@ protected function fetchArray($cursor = null)
 		{
 			return $cursor->fetch(PDO::FETCH_NUM);
 		}
+
 		if ($this->prepared instanceof PDOStatement)
 		{
 			return $this->prepared->fetch(PDO::FETCH_NUM);
@@ -821,6 +825,7 @@ protected function fetchAssoc($cursor = null)
 		{
 			return $cursor->fetch(PDO::FETCH_ASSOC);
 		}
+
 		if ($this->prepared instanceof PDOStatement)
 		{
 			return $this->prepared->fetch(PDO::FETCH_ASSOC);
@@ -843,6 +848,7 @@ protected function fetchObject($cursor = null, $class = 'stdClass')
 		{
 			return $cursor->fetchObject($class);
 		}
+
 		if ($this->prepared instanceof PDOStatement)
 		{
 			return $this->prepared->fetchObject($class);
@@ -867,6 +873,7 @@ protected function freeResult($cursor = null)
 			$cursor->closeCursor();
 			$cursor = null;
 		}
+
 		if ($this->prepared instanceof PDOStatement)
 		{
 			$this->prepared->closeCursor();
diff --git a/libraries/joomla/database/driver/sqlsrv.php b/libraries/joomla/database/driver/sqlsrv.php
index d7b1c61a44324..99f716b046606 100644
--- a/libraries/joomla/database/driver/sqlsrv.php
+++ b/libraries/joomla/database/driver/sqlsrv.php
@@ -614,6 +614,7 @@ public function execute()
 		if ($this->debug)
 		{
 			$this->timings[] = microtime(true);
+
 			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
 			{
 				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@@ -1048,6 +1049,7 @@ public function renameTable($oldTable, $newTable, $backup = null, $prefix = null
 		{
 			$constraints = $this->getTableConstraints($oldTable);
 		}
+
 		if (!empty($constraints))
 		{
 			$this->renameConstraints($constraints, $prefix, $backup);
diff --git a/libraries/joomla/database/query.php b/libraries/joomla/database/query.php
index d533c0bfb7bc3..cabbd67c65127 100644
--- a/libraries/joomla/database/query.php
+++ b/libraries/joomla/database/query.php
@@ -1137,6 +1137,7 @@ public function join($type, $conditions)
 		{
 			$this->join = array();
 		}
+
 		$this->join[] = new JDatabaseQueryElement(strtoupper($type) . ' JOIN', $conditions);
 
 		return $this;
@@ -1560,7 +1561,6 @@ public function union($query, $distinct = false, $glue = '')
 		{
 			$glue = ')' . PHP_EOL . 'UNION (';
 			$name = 'UNION ()';
-
 		}
 
 		// Get the JDatabaseQueryElement if it does not exist
diff --git a/libraries/joomla/database/query/sqlite.php b/libraries/joomla/database/query/sqlite.php
index 32b414fe801a4..e935822437515 100644
--- a/libraries/joomla/database/query/sqlite.php
+++ b/libraries/joomla/database/query/sqlite.php
@@ -260,4 +260,19 @@ public function dateAdd($date, $interval, $datePart)
 			return "datetime('" . $date . "', '" . $interval . " " . $datePart . "')";
 		}
 	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * Usage:
+	 * $query->where('published_up < '.$query->currentTimestamp());
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	public function currentTimestamp()
+	{
+		return 'CURRENT_TIMESTAMP';
+	}
 }
diff --git a/libraries/joomla/database/query/sqlsrv.php b/libraries/joomla/database/query/sqlsrv.php
index 8c0a2d067ce13..4982e2770b9d1 100644
--- a/libraries/joomla/database/query/sqlsrv.php
+++ b/libraries/joomla/database/query/sqlsrv.php
@@ -98,7 +98,6 @@ public function __toString()
 
 				if ($this instanceof JDatabaseQueryLimitable && ($this->limit > 0 || $this->offset > 0))
 				{
-
 					$query = $this->processLimit($query, $this->limit, $this->offset);
 				}
 
diff --git a/libraries/joomla/document/error/error.php b/libraries/joomla/document/error/error.php
index 17416d156c04b..5ce78fbc94b1e 100644
--- a/libraries/joomla/document/error/error.php
+++ b/libraries/joomla/document/error/error.php
@@ -58,6 +58,7 @@ public function setError($error)
 		if ($error instanceof Exception)
 		{
 			$this->_error = & $error;
+
 			return true;
 		}
 		else
@@ -107,6 +108,7 @@ public function render($cache = false, $params = array())
 		$data = $this->_loadTemplate($directory . '/' . $template, $file);
 
 		parent::render();
+
 		return $data;
 	}
 
@@ -151,6 +153,7 @@ public function renderBacktrace()
 	{
 		$contents = null;
 		$backtrace = $this->_error->getTrace();
+
 		if (is_array($backtrace))
 		{
 			ob_start();
@@ -164,10 +167,12 @@ public function renderBacktrace()
 			echo '		<td class="TD"><strong>Function</strong></td>';
 			echo '		<td class="TD"><strong>Location</strong></td>';
 			echo '	</tr>';
+
 			for ($i = count($backtrace) - 1; $i >= 0; $i--)
 			{
 				echo '	<tr>';
 				echo '		<td class="TD">' . $j . '</td>';
+
 				if (isset($backtrace[$i]['class']))
 				{
 					echo '	<td class="TD">' . $backtrace[$i]['class'] . $backtrace[$i]['type'] . $backtrace[$i]['function'] . '()</td>';
@@ -176,6 +181,7 @@ public function renderBacktrace()
 				{
 					echo '	<td class="TD">' . $backtrace[$i]['function'] . '()</td>';
 				}
+
 				if (isset($backtrace[$i]['file']))
 				{
 					echo '		<td class="TD">' . $backtrace[$i]['file'] . ':' . $backtrace[$i]['line'] . '</td>';
@@ -184,13 +190,16 @@ public function renderBacktrace()
 				{
 					echo '		<td class="TD">&#160;</td>';
 				}
+
 				echo '	</tr>';
 				$j++;
 			}
+
 			echo '</table>';
 			$contents = ob_get_contents();
 			ob_end_clean();
 		}
+
 		return $contents;
 	}
 }
diff --git a/libraries/joomla/document/feed/feed.php b/libraries/joomla/document/feed/feed.php
index a3ce470c3a4c4..238d215a9e5ab 100644
--- a/libraries/joomla/document/feed/feed.php
+++ b/libraries/joomla/document/feed/feed.php
@@ -198,10 +198,12 @@ public function render($cache = false, $params = array())
 
 		// Instantiate feed renderer and set the mime encoding
 		$renderer = $this->loadRenderer(($type) ? $type : 'rss');
+
 		if (!is_a($renderer, 'JDocumentRenderer'))
 		{
 			throw new Exception(JText::_('JGLOBAL_RESOURCE_NOT_FOUND'), 404);
 		}
+
 		$this->setMimeEncoding($renderer->getContentType());
 
 		// Output
@@ -219,6 +221,7 @@ public function render($cache = false, $params = array())
 		$data .= $renderer->render();
 
 		parent::render();
+
 		return $data;
 	}
 
diff --git a/libraries/joomla/document/html/html.php b/libraries/joomla/document/html/html.php
index 2475d457b294f..051425cc2aa92 100644
--- a/libraries/joomla/document/html/html.php
+++ b/libraries/joomla/document/html/html.php
@@ -139,6 +139,7 @@ public function getHeadData()
 		$data['script']      = $this->_script;
 		$data['custom']      = $this->_custom;
 		$data['scriptText']  = JText::script();
+
 		return $data;
 	}
 
@@ -191,7 +192,6 @@ public function setHeadData($data)
 	 */
 	public function mergeHeadData($data)
 	{
-
 		if (empty($data) || !is_array($data))
 		{
 			return;
@@ -210,6 +210,7 @@ public function mergeHeadData($data)
 			foreach ($data['metaTags'] as $type1 => $data1)
 			{
 				$booldog = $type1 == 'http-equiv' ? true : false;
+
 				foreach ($data1 as $name2 => $data2)
 				{
 					$this->setMetaData($name2, $data2, $booldog);
@@ -370,12 +371,14 @@ public function getBuffer($type = null, $name = null, $attribs = array())
 		}
 
 		$title = (isset($attribs['title'])) ? $attribs['title'] : null;
+
 		if (isset(parent::$_buffer[$type][$name][$title]))
 		{
 			return parent::$_buffer[$type][$name][$title];
 		}
 
 		$renderer = $this->loadRenderer($type);
+
 		if ($this->_caching == true && $type == 'modules')
 		{
 			$cache = JFactory::getCache('com_modules', '');
@@ -473,6 +476,7 @@ public function render($caching = false, $params = array())
 
 		$data = $this->_renderTemplate();
 		parent::render();
+
 		return $data;
 	}
 
@@ -581,9 +585,11 @@ protected function _loadTemplate($directory, $filename)
 		// Try to find a favicon by checking the template and root folder
 		$path = $directory . '/';
 		$dirs = array($path, JPATH_BASE . '/');
+
 		foreach ($dirs as $dir)
 		{
 			$icon = $dir . 'favicon.ico';
+
 			if (file_exists($icon))
 			{
 				$path = str_replace(JPATH_BASE . '/', '', $dir);
diff --git a/libraries/joomla/document/html/renderer/head.php b/libraries/joomla/document/html/renderer/head.php
index 332dea0707b41..066b1bdf1a18d 100644
--- a/libraries/joomla/document/html/renderer/head.php
+++ b/libraries/joomla/document/html/renderer/head.php
@@ -72,6 +72,7 @@ public function fetchHead($document)
 
 		// Generate base tag (need to happen early)
 		$base = $document->getBase();
+
 		if (!empty($base))
 		{
 			$buffer .= $tab . '<base href="' . $document->getBase() . '" />' . $lnEnd;
@@ -95,6 +96,7 @@ public function fetchHead($document)
 
 		// Don't add empty descriptions
 		$documentDescription = $document->getDescription();
+
 		if ($documentDescription)
 		{
 			$buffer .= $tab . '<meta name="description" content="' . htmlspecialchars($documentDescription) . '" />' . $lnEnd;
@@ -102,6 +104,7 @@ public function fetchHead($document)
 
 		// Don't add empty generators
 		$generator = $document->getGenerator();
+
 		if ($generator)
 		{
 			$buffer .= $tab . '<meta name="generator" content="' . htmlspecialchars($generator) . '" />' . $lnEnd;
@@ -113,10 +116,12 @@ public function fetchHead($document)
 		foreach ($document->_links as $link => $linkAtrr)
 		{
 			$buffer .= $tab . '<link href="' . $link . '" ' . $linkAtrr['relType'] . '="' . $linkAtrr['relation'] . '"';
+
 			if ($temp = JArrayHelper::toString($linkAtrr['attribs']))
 			{
 				$buffer .= ' ' . $temp;
 			}
+
 			$buffer .= ' />' . $lnEnd;
 		}
 
@@ -151,7 +156,7 @@ public function fetchHead($document)
 			// This is for full XHTML support.
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . '<![CDATA[' . $lnEnd;
+				$buffer .= $tab . $tab . '/*<![CDATA[*/' . $lnEnd;
 			}
 
 			$buffer .= $content . $lnEnd;
@@ -159,8 +164,9 @@ public function fetchHead($document)
 			// See above note
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . ']]>' . $lnEnd;
+				$buffer .= $tab . $tab . '/*]]>*/' . $lnEnd;
 			}
+
 			$buffer .= $tab . '</style>' . $lnEnd;
 		}
 
@@ -198,7 +204,7 @@ public function fetchHead($document)
 			// This is for full XHTML support.
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . '<![CDATA[' . $lnEnd;
+				$buffer .= $tab . $tab . '//<![CDATA[' . $lnEnd;
 			}
 
 			$buffer .= $content . $lnEnd;
@@ -206,8 +212,9 @@ public function fetchHead($document)
 			// See above note
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . ']]>' . $lnEnd;
+				$buffer .= $tab . $tab . '//]]>' . $lnEnd;
 			}
+
 			$buffer .= $tab . '</script>' . $lnEnd;
 		}
 
@@ -215,6 +222,12 @@ public function fetchHead($document)
 		if (count(JText::script()))
 		{
 			$buffer .= $tab . '<script type="text/javascript">' . $lnEnd;
+
+			if ($document->_mime != 'text/html')
+			{
+				$buffer .= $tab . $tab . '//<![CDATA[' . $lnEnd;
+			}
+
 			$buffer .= $tab . $tab . '(function() {' . $lnEnd;
 			$buffer .= $tab . $tab . $tab . 'var strings = ' . json_encode(JText::script()) . ';' . $lnEnd;
 			$buffer .= $tab . $tab . $tab . 'if (typeof Joomla == \'undefined\') {' . $lnEnd;
@@ -225,6 +238,12 @@ public function fetchHead($document)
 			$buffer .= $tab . $tab . $tab . $tab . 'Joomla.JText.load(strings);' . $lnEnd;
 			$buffer .= $tab . $tab . $tab . '}' . $lnEnd;
 			$buffer .= $tab . $tab . '})();' . $lnEnd;
+
+			if ($document->_mime != 'text/html')
+			{
+				$buffer .= $tab . $tab . '//]]>' . $lnEnd;
+			}
+
 			$buffer .= $tab . '</script>' . $lnEnd;
 		}
 
diff --git a/libraries/joomla/document/html/renderer/module.php b/libraries/joomla/document/html/renderer/module.php
index afa0ce069534f..c41325e3e0c24 100644
--- a/libraries/joomla/document/html/renderer/module.php
+++ b/libraries/joomla/document/html/renderer/module.php
@@ -89,7 +89,6 @@ public function render($module, $attribs = array(), $content = null)
 
 		if ($params->get('cache', 0) == 1 && $conf->get('caching') >= 1 && $cachemode != 'id' && $cachemode != 'safeuri')
 		{
-
 			// Default to itemid creating method and workarounds on
 			$cacheparams = new stdClass;
 			$cacheparams->cachemode = $cachemode;
@@ -98,7 +97,6 @@ public function render($module, $attribs = array(), $content = null)
 			$cacheparams->methodparams = array($module, $attribs);
 
 			$contents = JModuleHelper::ModuleCache($module, $params, $cacheparams);
-
 		}
 		else
 		{
diff --git a/libraries/joomla/document/image/image.php b/libraries/joomla/document/image/image.php
index 3ed74d3884409..33c88899d80e9 100644
--- a/libraries/joomla/document/image/image.php
+++ b/libraries/joomla/document/image/image.php
@@ -69,6 +69,7 @@ public function render($cache = false, $params = array())
 		$this->_charset = null;
 
 		parent::render();
+
 		return $this->getBuffer();
 	}
 }
diff --git a/libraries/joomla/document/json/json.php b/libraries/joomla/document/json/json.php
index 2069ced12d703..b58f55afaa14d 100644
--- a/libraries/joomla/document/json/json.php
+++ b/libraries/joomla/document/json/json.php
@@ -39,7 +39,9 @@ public function __construct($options = array())
 		parent::__construct($options);
 
 		// Set mime type
-		if (isset($_SERVER['HTTP_ACCEPT']) AND strpos($_SERVER['HTTP_ACCEPT'], 'application/json') === false AND strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false)
+		if (isset($_SERVER['HTTP_ACCEPT'])
+			&& strpos($_SERVER['HTTP_ACCEPT'], 'application/json') === false
+			&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false)
 		{
 			// Internet Explorer < 10
 			$this->_mime = 'text/plain';
@@ -68,6 +70,7 @@ public function render($cache = false, $params = array())
 		$app = JFactory::getApplication();
 
 		$app->allowCache(false);
+
 		if ($this->_mime == 'application/json')
 		{
 			// Browser other than Internet Explorer < 10
diff --git a/libraries/joomla/document/opensearch/opensearch.php b/libraries/joomla/document/opensearch/opensearch.php
index 9f3cf26f731ba..78e4a0a3b6636 100644
--- a/libraries/joomla/document/opensearch/opensearch.php
+++ b/libraries/joomla/document/opensearch/opensearch.php
@@ -122,6 +122,7 @@ public function __construct($options = array())
 	public function render($cache = false, $params = array())
 	{
 		$xml = new DOMDocument('1.0', 'utf-8');
+
 		if (defined('JDEBUG') && JDEBUG)
 		{
 			$xml->formatOutput = true;
@@ -166,12 +167,14 @@ public function render($cache = false, $params = array())
 			{
 				$elUrl->setAttribute('rel', $url->rel);
 			}
+
 			$elUrl->setAttribute('template', $url->template);
 			$elOs->appendChild($elUrl);
 		}
 
 		$xml->appendChild($elOs);
 		parent::render();
+
 		return $xml->saveXML();
 	}
 
diff --git a/libraries/joomla/document/raw/raw.php b/libraries/joomla/document/raw/raw.php
index 61de428bb9cc3..83016665bcbc2 100644
--- a/libraries/joomla/document/raw/raw.php
+++ b/libraries/joomla/document/raw/raw.php
@@ -49,6 +49,7 @@ public function __construct($options = array())
 	public function render($cache = false, $params = array())
 	{
 		parent::render();
+
 		return $this->getBuffer();
 	}
 }
diff --git a/libraries/joomla/document/renderer.php b/libraries/joomla/document/renderer.php
index 2793f1a637501..ec5f3b4b1c17b 100644
--- a/libraries/joomla/document/renderer.php
+++ b/libraries/joomla/document/renderer.php
@@ -89,5 +89,4 @@ protected function _relToAbs($text)
 
 		return $text;
 	}
-
 }
diff --git a/libraries/joomla/facebook/facebook.php b/libraries/joomla/facebook/facebook.php
index bd4ab6f559659..0dd5bcc91fa17 100644
--- a/libraries/joomla/facebook/facebook.php
+++ b/libraries/joomla/facebook/facebook.php
@@ -43,69 +43,69 @@ class JFacebook
 	protected $user;
 
 	/**
-	* @var    JFacebookStatus  Facebook API object for status.
-	* @since  13.1
-	*/
+	 * @var    JFacebookStatus  Facebook API object for status.
+	 * @since  13.1
+	 */
 	protected $status;
 
 	/**
-	* @var    JFacebookCheckin  Facebook API object for checkin.
-	* @since  13.1
-	*/
+	 * @var    JFacebookCheckin  Facebook API object for checkin.
+	 * @since  13.1
+	 */
 	protected $checkin;
 
 	/**
-	* @var    JFacebookEvent  Facebook API object for event.
-	* @since  13.1
-	*/
+	 * @var    JFacebookEvent  Facebook API object for event.
+	 * @since  13.1
+	 */
 	protected $event;
 
 	/**
-	* @var    JFacebookGroup  Facebook API object for group.
-	* @since  13.1
-	*/
+	 * @var    JFacebookGroup  Facebook API object for group.
+	 * @since  13.1
+	 */
 	protected $group;
 
 	/**
-	* @var    JFacebookLink  Facebook API object for link.
-	* @since  13.1
-	*/
+	 * @var    JFacebookLink  Facebook API object for link.
+	 * @since  13.1
+	 */
 	protected $link;
 
 	/**
-	* @var    JFacebookNote  Facebook API object for note.
-	* @since  13.1
-	*/
+	 * @var    JFacebookNote  Facebook API object for note.
+	 * @since  13.1
+	 */
 	protected $note;
 
 	/**
-	* @var    JFacebookPost  Facebook API object for post.
-	* @since  13.1
-	*/
+	 * @var    JFacebookPost  Facebook API object for post.
+	 * @since  13.1
+	 */
 	protected $post;
 
 	/**
-	* @var    JFacebookComment  Facebook API object for comment.
-	* @since  13.1
-	*/
+	 * @var    JFacebookComment  Facebook API object for comment.
+	 * @since  13.1
+	 */
 	protected $comment;
 
 	/**
-	* @var    JFacebookPhoto  Facebook API object for photo.
-	* @since  13.1
-	*/
+	 * @var    JFacebookPhoto  Facebook API object for photo.
+	 * @since  13.1
+	 */
 	protected $photo;
 
 	/**
-	* @var    JFacebookVideo  Facebook API object for video.
-	* @since  13.1
-	*/
+	 * @var    JFacebookVideo  Facebook API object for video.
+	 * @since  13.1
+	 */
 	protected $video;
 
 	/**
-	* @var    JFacebookAlbum  Facebook API object for album.
-	* @since  13.1
-	*/
+	 * @var    JFacebookAlbum  Facebook API object for album.
+	 * @since  13.1
+	 */
 	protected $album;
 
 	/**
@@ -171,13 +171,13 @@ public function getOption($key)
 	/**
 	 * Set an option for the JFacebook instance.
 	 *
-	* @param   string  $key    The name of the option to set.
-	* @param   mixed   $value  The option value to set.
-	*
-	* @return  JFacebook  This object for method chaining.
-	*
-	* @since   13.1
-	*/
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JFacebook  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
 	public function setOption($key, $value)
 	{
 		$this->options->set($key, $value);
diff --git a/libraries/joomla/facebook/status.php b/libraries/joomla/facebook/status.php
index 7e7ae60e74250..360e40075bf5c 100644
--- a/libraries/joomla/facebook/status.php
+++ b/libraries/joomla/facebook/status.php
@@ -131,5 +131,4 @@ public function deleteLike($status)
 	{
 		return $this->deleteConnection($status, 'likes');
 	}
-
 }
diff --git a/libraries/joomla/feed/link.php b/libraries/joomla/feed/link.php
index db3c268cad53c..4511f18e1e5fc 100644
--- a/libraries/joomla/feed/link.php
+++ b/libraries/joomla/feed/link.php
@@ -92,6 +92,7 @@ public function __construct($uri = null, $relation = null, $type = null, $langua
 		{
 			throw new InvalidArgumentException('Length must be numeric.');
 		}
+
 		$this->length = (int) $length;
 	}
 }
diff --git a/libraries/joomla/feed/parser.php b/libraries/joomla/feed/parser.php
index 13c2353acaf29..4951b3c3f6758 100644
--- a/libraries/joomla/feed/parser.php
+++ b/libraries/joomla/feed/parser.php
@@ -103,6 +103,7 @@ public function parse()
 			// Skip over this element's children since it has been processed.
 			$this->moveToClosingElement();
 		}
+
 		while ($this->moveToNextElement());
 
 		return $feed;
diff --git a/libraries/joomla/feed/parser/rss/itunes.php b/libraries/joomla/feed/parser/rss/itunes.php
index 1dcb824844c4d..a45af1a9fbfb4 100644
--- a/libraries/joomla/feed/parser/rss/itunes.php
+++ b/libraries/joomla/feed/parser/rss/itunes.php
@@ -31,7 +31,7 @@ class JFeedParserRssItunes implements JFeedParserNamespace
 	 */
 	public function processElementForFeed(JFeed $feed, SimpleXMLElement $el)
 	{
-
+		return;
 	}
 
 	/**
@@ -46,6 +46,6 @@ public function processElementForFeed(JFeed $feed, SimpleXMLElement $el)
 	 */
 	public function processElementForFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
 	{
-
+		return;
 	}
 }
diff --git a/libraries/joomla/feed/parser/rss/media.php b/libraries/joomla/feed/parser/rss/media.php
index b58b33f53c14e..eb314ab1ed61a 100644
--- a/libraries/joomla/feed/parser/rss/media.php
+++ b/libraries/joomla/feed/parser/rss/media.php
@@ -31,7 +31,7 @@ class JFeedParserRssMedia implements JFeedParserNamespace
 	 */
 	public function processElementForFeed(JFeed $feed, SimpleXMLElement $el)
 	{
-
+		return;
 	}
 
 	/**
@@ -46,6 +46,6 @@ public function processElementForFeed(JFeed $feed, SimpleXMLElement $el)
 	 */
 	public function processElementForFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
 	{
-
+		return;
 	}
 }
diff --git a/libraries/joomla/filesystem/folder.php b/libraries/joomla/filesystem/folder.php
index d2b2a87d7f764..a60406eccd9cb 100644
--- a/libraries/joomla/filesystem/folder.php
+++ b/libraries/joomla/filesystem/folder.php
@@ -54,6 +54,7 @@ public static function copy($src, $dest, $path = '', $force = false, $use_stream
 		{
 			throw new RuntimeException('Source folder not found', -1);
 		}
+
 		if (self::exists($dest) && !$force)
 		{
 			throw new RuntimeException('Destination folder already exists', -1);
@@ -154,6 +155,7 @@ public static function copy($src, $dest, $path = '', $force = false, $use_stream
 				}
 			}
 		}
+
 		return true;
 	}
 
@@ -253,6 +255,7 @@ public static function create($path = '', $mode = 0755)
 						break;
 					}
 				}
+
 				if ($inBaseDir == false)
 				{
 					// Return false for JFolder::create because the path to be created is not in open_basedir
@@ -279,6 +282,7 @@ public static function create($path = '', $mode = 0755)
 			// Reset umask
 			@umask($origmask);
 		}
+
 		return $ret;
 	}
 
diff --git a/libraries/joomla/filesystem/patcher.php b/libraries/joomla/filesystem/patcher.php
index ecf2a77845730..078593bfcc55e 100644
--- a/libraries/joomla/filesystem/patcher.php
+++ b/libraries/joomla/filesystem/patcher.php
@@ -285,6 +285,7 @@ protected static function findHeader(&$lines, &$src, &$dst)
 		{
 			$line = next($lines);
 		}
+
 		if ($line === false)
 		{
 			// No header found, return false
@@ -317,6 +318,7 @@ protected static function findHeader(&$lines, &$src, &$dst)
 			{
 				throw new RuntimeException('Unexpected EOF');
 			}
+
 			return true;
 		}
 	}
diff --git a/libraries/joomla/filter/input.php b/libraries/joomla/filter/input.php
index 829fb0203731b..5fea9b4b904ec 100644
--- a/libraries/joomla/filter/input.php
+++ b/libraries/joomla/filter/input.php
@@ -182,6 +182,7 @@ public static function &getInstance($tagsArray = array(), $attrArray = array(),
 	 *                           HTML:      A sanitised string,
 	 *                           ARRAY:     An array,
 	 *                           PATH:      A sanitised file path,
+	 *                           TRIM:      A string trimmed from normal, non-breaking and multibyte spaces
 	 *                           USERNAME:  Do not use (use an application specific filter),
 	 *                           RAW:       The raw string is returned with no filtering,
 	 *                           unknown:   An unknown filter will act like STRING. If the input is an array it will return an
@@ -256,6 +257,12 @@ public function clean($source, $type = 'string')
 				$result = @ (string) $matches[0];
 				break;
 
+			case 'TRIM':
+				$result = (string) trim($source);
+				$result = trim($result, chr(0xE3) . chr(0x80) . chr(0x80));
+				$result = trim($result, chr(0xC2) . chr(0xA0));
+				break;
+
 			case 'USERNAME':
 				$result = (string) preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
 				break;
@@ -276,6 +283,7 @@ public function clean($source, $type = 'string')
 							$source[$key] = $this->_remove($this->_decode($value));
 						}
 					}
+
 					$result = $source;
 				}
 				else
@@ -484,6 +492,7 @@ protected function _cleanTags($source)
 						$fromSpace = substr($fromSpace, $attribEnd + 1);
 					}
 				}
+
 				if (strpos($fromSpace, '=') !== false)
 				{
 					// If the attribute value is wrapped in quotes we need to grab the substring from
diff --git a/libraries/joomla/form/fields/list.php b/libraries/joomla/form/fields/list.php
index 82eb7d8138a7f..1f9a8ef211053 100644
--- a/libraries/joomla/form/fields/list.php
+++ b/libraries/joomla/form/fields/list.php
@@ -59,11 +59,28 @@ protected function getInput()
 		// Get the field options.
 		$options = (array) $this->getOptions();
 
-		// Create a read-only list (no name) with a hidden input to store the value.
+		// Create a read-only list (no name) with hidden input(s) to store the value(s).
 		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true')
 		{
 			$html[] = JHtml::_('select.genericlist', $options, '', trim($attr), 'value', 'text', $this->value, $this->id);
-			$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
+
+			// E.g. form field type tag sends $this->value as array
+			if ($this->multiple && is_array($this->value))
+			{
+				if (!count($this->value))
+				{
+					$this->value[] = '';
+				}
+
+				foreach ($this->value as $value)
+				{
+					$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"/>';
+				}
+			}
+			else
+			{
+				$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
+			}
 		}
 		else
 		// Create a regular list.
diff --git a/libraries/joomla/form/fields/repeatable.php b/libraries/joomla/form/fields/repeatable.php
index 42c4017dff643..a5bf74c659193 100644
--- a/libraries/joomla/form/fields/repeatable.php
+++ b/libraries/joomla/form/fields/repeatable.php
@@ -111,6 +111,7 @@ protected function getInput()
 
 		JText::script('JAPPLY');
 		JText::script('JCANCEL');
+
 		return implode("\n", $str);
 	}
 }
diff --git a/libraries/joomla/form/fields/rules.php b/libraries/joomla/form/fields/rules.php
index 96de1bddfdfd4..6140ba00f61aa 100644
--- a/libraries/joomla/form/fields/rules.php
+++ b/libraries/joomla/form/fields/rules.php
@@ -268,7 +268,8 @@ protected function getInput()
 
 				$html[] = '<td headers="settings-th' . $group->value . '">';
 
-				$html[] = '<select class="input-small" name="' . $this->name . '[' . $action->name . '][' . $group->value . ']" id="' . $this->id . '_' . $action->name
+				$html[] = '<select class="input-small" name="' . $this->name . '[' . $action->name . '][' . $group->value . ']" id="' . $this->id
+					. '_' . $action->name
 					. '_' . $group->value . '" title="'
 					. JText::sprintf('JLIB_RULES_SELECT_ALLOW_DENY_GROUP', JText::_($action->title), trim($group->text)) . '">';
 
diff --git a/libraries/joomla/form/helper.php b/libraries/joomla/form/helper.php
index f64a22eacd5e7..701a88f3c3909 100644
--- a/libraries/joomla/form/helper.php
+++ b/libraries/joomla/form/helper.php
@@ -112,10 +112,12 @@ protected static function loadType($entity, $type, $new = true)
 		}
 
 		$class = self::loadClass($entity, $type);
+
 		if ($class !== false)
 		{
 			// Instantiate a new type object.
 			$types[$key] = new $class;
+
 			return $types[$key];
 		}
 		else
@@ -190,7 +192,6 @@ protected static function loadClass($entity, $type)
 		// If the type is complex, add the base type to the paths.
 		if ($pos = strpos($type, '_'))
 		{
-
 			// Add the complex type prefix to the paths.
 			for ($i = 0, $n = count($paths); $i < $n; $i++)
 			{
@@ -209,11 +210,13 @@ protected static function loadClass($entity, $type)
 
 		// Try to find the class file.
 		$type = strtolower($type) . '.php';
+
 		foreach ($paths as $path)
 		{
 			if ($file = JPath::find($path, $type))
 			{
 				require_once $file;
+
 				if (class_exists($class))
 				{
 					break;
diff --git a/libraries/joomla/form/rule/email.php b/libraries/joomla/form/rule/email.php
index adc4cd65cf8d7..11db97eb6d98c 100644
--- a/libraries/joomla/form/rule/email.php
+++ b/libraries/joomla/form/rule/email.php
@@ -96,7 +96,6 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 
 		if ($unique && !$multiple)
 		{
-
 			// Get the database object and a new query object.
 			$db = JFactory::getDbo();
 			$query = $db->getQuery(true);
diff --git a/libraries/joomla/form/rule/options.php b/libraries/joomla/form/rule/options.php
index a7e7c67cb8cb3..5ac7f2a567e07 100644
--- a/libraries/joomla/form/rule/options.php
+++ b/libraries/joomla/form/rule/options.php
@@ -43,6 +43,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 				return true;
 			}
 		}
+
 		return false;
 	}
 }
diff --git a/libraries/joomla/form/rule/tel.php b/libraries/joomla/form/rule/tel.php
index 315503f2dab49..137cfd6e37a1c 100644
--- a/libraries/joomla/form/rule/tel.php
+++ b/libraries/joomla/form/rule/tel.php
@@ -37,6 +37,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 	{
 		// If the field is empty and not required, the field is valid.
 		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
 		if (!$required && empty($value))
 		{
 			return true;
@@ -53,10 +54,11 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 		 */
 		$regexarray = array('NANP' => '/^(?:\+?1[-. ]?)?\(?([2-9][0-8][0-9])\)?[-. ]?([2-9][0-9]{2})[-. ]?([0-9]{4})$/',
 			'ITU-T' => '/^\+(?:[0-9] ?){6,14}[0-9]$/', 'EPP' => '/^\+[0-9]{1,3}\.[0-9]{4,14}(?:x.+)?$/');
+
 		if (isset($element['plan']))
 		{
-
 			$plan = (string) $element['plan'];
+
 			if ($plan == 'northamerica' || $plan == 'us')
 			{
 				$plan = 'NANP';
@@ -75,7 +77,6 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 			// Test the value against the regular expression.
 			if (preg_match($regex, $value) == false)
 			{
-
 				return false;
 			}
 		}
@@ -88,14 +89,13 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 			 */
 			$cleanvalue = preg_replace('/[+. \-(\)]/', '', $value);
 			$regex = '/^[0-9]{7,15}?$/';
+
 			if (preg_match($regex, $cleanvalue) == true)
 			{
-
 				return true;
 			}
 			else
 			{
-
 				return false;
 			}
 		}
diff --git a/libraries/joomla/form/rule/url.php b/libraries/joomla/form/rule/url.php
index e7af1a2059a68..d5689c3a4cf49 100644
--- a/libraries/joomla/form/rule/url.php
+++ b/libraries/joomla/form/rule/url.php
@@ -39,10 +39,12 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 	{
 		// If the field is empty and not required, the field is valid.
 		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
 		if (!$required && empty($value))
 		{
 			return true;
 		}
+
 		$urlParts = JString::parse_url($value);
 
 		// See http://www.w3.org/Addressing/URL/url-spec.txt
@@ -66,12 +68,15 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 		{
 			return false;
 		}
+
 		$urlScheme = (string) $urlParts['scheme'];
 		$urlScheme = strtolower($urlScheme);
+
 		if (in_array($urlScheme, $scheme) == false)
 		{
 			return false;
 		}
+
 		// For some schemes here must be two slashes.
 		if (($urlScheme == 'http' || $urlScheme == 'https' || $urlScheme == 'ftp' || $urlScheme == 'sftp' || $urlScheme == 'gopher'
 			|| $urlScheme == 'wais' || $urlScheme == 'gopher' || $urlScheme == 'prospero' || $urlScheme == 'telnet' || $urlScheme == 'git')
@@ -79,20 +84,24 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 		{
 			return false;
 		}
+
 		// The best we can do for the rest is make sure that the strings are valid UTF-8
 		// and the port is an integer.
 		if (array_key_exists('host', $urlParts) && !JString::valid((string) $urlParts['host']))
 		{
 			return false;
 		}
+
 		if (array_key_exists('port', $urlParts) && !is_int((int) $urlParts['port']))
 		{
 			return false;
 		}
+
 		if (array_key_exists('path', $urlParts) && !JString::valid((string) $urlParts['path']))
 		{
 			return false;
 		}
+
 		return true;
 	}
 }
diff --git a/libraries/joomla/github/package/data.php b/libraries/joomla/github/package/data.php
index 1855fd26332e9..1cbed7ac4f8dc 100644
--- a/libraries/joomla/github/package/data.php
+++ b/libraries/joomla/github/package/data.php
@@ -17,37 +17,36 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub.Data
  * @since       12.3
-
+ *
  * http://developer.github.com/v3/git/
-Git DB API
-
-The Git Database API gives you access to read and write raw Git objects to your Git database on GitHub and to list
- * and update your references (branch heads and tags).
-
-This basically allows you to reimplement a lot of Git functionality over our API - by creating raw objects
- * directly into the database and updating branch references you could technically do just about anything that
- * Git can do without having Git installed.
-
-Git DB API functions will return a 409 if the git repo for a Repository is empty or unavailable.
- * This typically means it is being created still. Contact Support if this response status persists.
-
-git db
-
-For more information on the Git object database, please read the Git Internals chapter of the Pro Git book.
-
-As an example, if you wanted to commit a change to a file in your repository, you would:
-
-    get the current commit object
-    retrieve the tree it points to
-    retrieve the content of the blob object that tree has for that particular file path
-    change the content somehow and post a new blob object with that new content, getting a blob SHA back
-    post a new tree object with that file path pointer replaced with your new blob SHA getting a tree SHA back
-    create a new commit object with the current commit SHA as the parent and the new tree SHA, getting a commit SHA back
-    update the reference of your branch to point to the new commit SHA
-
-It might seem complex, but it’s actually pretty simple when you understand the model and it opens up a ton of
+ * Git DB API
+ *
+ * The Git Database API gives you access to read and write raw Git objects to your Git database on GitHub and to list
+ *  * and update your references (branch heads and tags).
+ *
+ * This basically allows you to reimplement a lot of Git functionality over our API - by creating raw objects
+ *  * directly into the database and updating branch references you could technically do just about anything that
+ *  * Git can do without having Git installed.
+ *
+ * Git DB API functions will return a 409 if the git repo for a Repository is empty or unavailable.
+ *  * This typically means it is being created still. Contact Support if this response status persists.
+ *
+ * git db
+ *
+ * For more information on the Git object database, please read the Git Internals chapter of the Pro Git book.
+ *
+ * As an example, if you wanted to commit a change to a file in your repository, you would:
+ *
+ *     get the current commit object
+ *     retrieve the tree it points to
+ *     retrieve the content of the blob object that tree has for that particular file path
+ *     change the content somehow and post a new blob object with that new content, getting a blob SHA back
+ *     post a new tree object with that file path pointer replaced with your new blob SHA getting a tree SHA back
+ *     create a new commit object with the current commit SHA as the parent and the new tree SHA, getting a commit SHA back
+ *     update the reference of your branch to point to the new commit SHA
+ *
+ * It might seem complex, but it’s actually pretty simple when you understand the model and it opens up a ton of
  * things you could potentially do with the API.
-
  */
 class JGithubPackageData extends JGithubPackage
 {
diff --git a/libraries/joomla/github/package/repositories/contents.php b/libraries/joomla/github/package/repositories/contents.php
index c70653ad5e07f..6fcbe662f57c3 100644
--- a/libraries/joomla/github/package/repositories/contents.php
+++ b/libraries/joomla/github/package/repositories/contents.php
@@ -27,34 +27,34 @@ class JGithubPackageRepositoriesContents extends JGithubPackage
 	 * Get the README
 	 *
 	 * This method returns the preferred README for a repository.
-
-	GET /repos/:owner/:repo/readme
-
-	Parameters
-
-	ref
-	Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
-
-	Response
-
-	Status: 200 OK
-	X-RateLimit-Limit: 5000
-	X-RateLimit-Remaining: 4999
-
-	{
-	"type": "file",
-	"encoding": "base64",
-	"_links": {
-	"git": "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
-	"self": "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
-	"html": "https://github.com/pengwynn/octokit/blob/master/README.md"
-	},
-	"size": 5362,
-	"name": "README.md",
-	"path": "README.md",
-	"content": "encoded content ...",
-	"sha": "3d21ec53a331a6f037a91c368710b99387d012c1"
-	}
+	 *
+	 * GET /repos/:owner/:repo/readme
+	 *
+	 * Parameters
+	 *
+	 * ref
+	 * Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * Response
+	 *
+	 * Status: 200 OK
+	 * X-RateLimit-Limit: 5000
+	 * X-RateLimit-Remaining: 4999
+	 *
+	 * {
+	 * "type": "file",
+	 * "encoding": "base64",
+	 * "_links": {
+	 * "git": "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
+	 * "self": "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
+	 * "html": "https://github.com/pengwynn/octokit/blob/master/README.md"
+	 * },
+	 * "size": 5362,
+	 * "name": "README.md",
+	 * "path": "README.md",
+	 * "content": "encoded content ...",
+	 * "sha": "3d21ec53a331a6f037a91c368710b99387d012c1"
+	 * }
 	 *
 	 * @param   string  $owner  The name of the owner of the GitHub repository.
 	 * @param   string  $repo   The name of the GitHub repository.
@@ -81,40 +81,39 @@ public function getReadme($owner, $repo, $ref = '')
 	}
 
 	/**
-
-	Get contents
-
-	This method returns the contents of any file or directory in a repository.
-
-	GET /repos/:owner/:repo/contents/:path
-
-	Parameters
-
-	path
-	Optional string - The content path.
-	ref
-	Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
-
-	Response
-
-	Status: 200 OK
-	X-RateLimit-Limit: 5000
-	X-RateLimit-Remaining: 4999
-
-	{
-	"type": "file",
-	"encoding": "base64",
-	"_links": {
-	"git": "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
-	"self": "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
-	"html": "https://github.com/pengwynn/octokit/blob/master/README.md"
-	},
-	"size": 5362,
-	"name": "README.md",
-	"path": "README.md",
-	"content": "encoded content ...",
-	"sha": "3d21ec53a331a6f037a91c368710b99387d012c1"
-	}
+	 * Get contents
+	 *
+	 * This method returns the contents of any file or directory in a repository.
+	 *
+	 * GET /repos/:owner/:repo/contents/:path
+	 *
+	 * Parameters
+	 *
+	 * path
+	 * Optional string - The content path.
+	 * ref
+	 * Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * Response
+	 *
+	 * Status: 200 OK
+	 * X-RateLimit-Limit: 5000
+	 * X-RateLimit-Remaining: 4999
+	 *
+	 * {
+	 * "type": "file",
+	 * "encoding": "base64",
+	 * "_links": {
+	 * "git": "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
+	 * "self": "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
+	 * "html": "https://github.com/pengwynn/octokit/blob/master/README.md"
+	 * },
+	 * "size": 5362,
+	 * "name": "README.md",
+	 * "path": "README.md",
+	 * "content": "encoded content ...",
+	 * "sha": "3d21ec53a331a6f037a91c368710b99387d012c1"
+	 * }
 	 *
 	 * @param   string  $owner  The name of the owner of the GitHub repository.
 	 * @param   string  $repo   The name of the GitHub repository.
@@ -144,33 +143,32 @@ public function get($owner, $repo, $path, $ref = '')
 	}
 
 	/**
-
-	Get archive link
-
-	This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
+	 * Get archive link
+	 *
+	 * This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
 	 * Please make sure your HTTP framework is configured to follow redirects or you will need to use the Location header to make a second GET request.
-
-	Note: For private repositories, these links are temporary and expire quickly.
-
-	GET /repos/:owner/:repo/:archive_format/:ref
-
-	Parameters
-
-	archive_format
-	Either tarball or zipball
-	ref
-	Optional string - valid Git reference, defaults to master
-
-	Response
-
-	Status: 302 Found
-	Location: http://github.com/me/myprivate/tarball/master?SSO=thistokenexpires
-	X-RateLimit-Limit: 5000
-	X-RateLimit-Remaining: 4999
-
-	To follow redirects with curl, use the -L switch:
-
-	curl -L https://api.github.com/repos/pengwynn/octokit/tarball > octokit.tar.gz
+	 *
+	 * Note: For private repositories, these links are temporary and expire quickly.
+	 *
+	 * GET /repos/:owner/:repo/:archive_format/:ref
+	 *
+	 * Parameters
+	 *
+	 * archive_format
+	 * Either tarball or zipball
+	 * ref
+	 * Optional string - valid Git reference, defaults to master
+	 *
+	 * Response
+	 *
+	 * Status: 302 Found
+	 * Location: http://github.com/me/myprivate/tarball/master?SSO=thistokenexpires
+	 * X-RateLimit-Limit: 5000
+	 * X-RateLimit-Remaining: 4999
+	 *
+	 * To follow redirects with curl, use the -L switch:
+	 *
+	 * curl -L https://api.github.com/repos/pengwynn/octokit/tarball > octokit.tar.gz
 	 *
 	 * @param   string  $owner           The name of the owner of the GitHub repository.
 	 * @param   string  $repo            The name of the GitHub repository.
diff --git a/libraries/joomla/google/auth/oauth2.php b/libraries/joomla/google/auth/oauth2.php
index 947670cb20835..a7ebebd3912da 100644
--- a/libraries/joomla/google/auth/oauth2.php
+++ b/libraries/joomla/google/auth/oauth2.php
@@ -97,10 +97,12 @@ protected function googlize()
 		{
 			$this->client->setOption('authurl', 'https://accounts.google.com/o/oauth2/auth');
 		}
+
 		if (!$this->client->getOption('tokenurl'))
 		{
 			$this->client->setOption('tokenurl', 'https://accounts.google.com/o/oauth2/token');
 		}
+
 		if (!$this->client->getOption('requestparams'))
 		{
 			$this->client->setOption('requestparams', Array());
@@ -112,10 +114,12 @@ protected function googlize()
 		{
 			$params['access_type'] = 'offline';
 		}
+
 		if ($params['access_type'] == 'offline' && $this->client->getOption('userefresh') === null)
 		{
 			$this->client->setOption('userefresh', true);
 		}
+
 		if (!array_key_exists('approval_prompt', $params))
 		{
 			$params['approval_prompt'] = 'auto';
diff --git a/libraries/joomla/google/data.php b/libraries/joomla/google/data.php
index 2c84b38504d9c..447a9b02a1cf9 100644
--- a/libraries/joomla/google/data.php
+++ b/libraries/joomla/google/data.php
@@ -114,6 +114,7 @@ protected function listGetData($url, $maxpages = 1, $token = null)
 		{
 			$qurl .= 'pageToken=' . $token;
 		}
+
 		$jdata = $this->query($qurl);
 		$data = json_decode($jdata->body, true);
 
@@ -123,6 +124,7 @@ protected function listGetData($url, $maxpages = 1, $token = null)
 			{
 				$data['items'] = array_merge($data['items'], $this->listGetData($url, $maxpages - 1, $data['nextPageToken']));
 			}
+
 			return $data['items'];
 		}
 		elseif ($data)
diff --git a/libraries/joomla/google/data/calendar.php b/libraries/joomla/google/data/calendar.php
index e8e1341d48284..b6688ff5ea0ac 100644
--- a/libraries/joomla/google/data/calendar.php
+++ b/libraries/joomla/google/data/calendar.php
@@ -56,6 +56,7 @@ public function removeCalendar($calendarID)
 			{
 				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
 			}
+
 			return true;
 		}
 		else
@@ -209,6 +210,7 @@ public function clearCalendar($calendarID)
 			{
 				throw new UnexpectedValueException("Unexpected data received from Google: `{$data->body}`.");
 			}
+
 			return true;
 		}
 		else
@@ -237,6 +239,7 @@ public function deleteCalendar($calendarID)
 			{
 				throw new UnexpectedValueException("Unexpected data received from Google: `{$data->body}`.");
 			}
+
 			return true;
 		}
 		else
@@ -335,6 +338,7 @@ public function deleteEvent($calendarID, $eventID)
 			{
 				throw new UnexpectedValueException("Unexpected data received from Google: `{$data->body}`.");
 			}
+
 			return true;
 		}
 		else
diff --git a/libraries/joomla/google/data/picasa.php b/libraries/joomla/google/data/picasa.php
index f89e83ebec372..62708fc9ffa77 100644
--- a/libraries/joomla/google/data/picasa.php
+++ b/libraries/joomla/google/data/picasa.php
@@ -62,6 +62,7 @@ public function listAlbums($userID = 'default')
 				{
 					$items[] = new JGoogleDataPicasaAlbum($item, $this->options, $this->auth);
 				}
+
 				return $items;
 			}
 			else
diff --git a/libraries/joomla/google/data/picasa/album.php b/libraries/joomla/google/data/picasa/album.php
index 042144b3d7c38..fe54e9fe2c634 100644
--- a/libraries/joomla/google/data/picasa/album.php
+++ b/libraries/joomla/google/data/picasa/album.php
@@ -77,6 +77,7 @@ public function delete($match = '*')
 				{
 					throw new RuntimeException("Etag match failed: `$match`.");
 				}
+
 				throw $e;
 			}
 
@@ -84,6 +85,7 @@ public function delete($match = '*')
 			{
 				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
 			}
+
 			$this->xml = null;
 
 			return true;
@@ -114,6 +116,7 @@ public function getLink($type = 'edit')
 				return (string) $link->attributes()->href;
 			}
 		}
+
 		return false;
 	}
 
@@ -289,6 +292,7 @@ public function save($match = '*')
 				{
 					throw new RuntimeException("Etag match failed: `$match`.");
 				}
+
 				throw $e;
 			}
 
@@ -350,6 +354,7 @@ public function listPhotos()
 				{
 					$items[] = new JGoogleDataPicasaPhoto($item, $this->options, $this->auth);
 				}
+
 				return $items;
 			}
 			else
@@ -386,6 +391,7 @@ public function upload($file, $title = '', $summary = '')
 			{
 				throw new RuntimeException("Inappropriate file type.");
 			}
+
 			if (!($data = JFile::read($file)))
 			{
 				throw new RuntimeException("Cannot access file: `$file`");
diff --git a/libraries/joomla/google/data/picasa/photo.php b/libraries/joomla/google/data/picasa/photo.php
index 66fefc9a18734..ab5f47f172b19 100644
--- a/libraries/joomla/google/data/picasa/photo.php
+++ b/libraries/joomla/google/data/picasa/photo.php
@@ -77,6 +77,7 @@ public function delete($match = '*')
 				{
 					throw new RuntimeException("Etag match failed: `$match`.");
 				}
+
 				throw $e;
 			}
 
@@ -84,6 +85,7 @@ public function delete($match = '*')
 			{
 				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
 			}
+
 			$this->xml = null;
 
 			return true;
@@ -114,6 +116,7 @@ public function getLink($type = 'edit')
 				return (string) $link->attributes()->href;
 			}
 		}
+
 		return false;
 	}
 
@@ -147,6 +150,7 @@ public function getThumbnails()
 			$height = (int) $item->attributes()->height;
 			$thumbs[$width] = array('url' => $url, 'w' => $width, 'h' => $height);
 		}
+
 		return $thumbs;
 	}
 
@@ -330,6 +334,7 @@ public function save($match = '*')
 				{
 					throw new RuntimeException("Etag match failed: `$match`.");
 				}
+
 				throw $e;
 			}
 
diff --git a/libraries/joomla/google/data/plus.php b/libraries/joomla/google/data/plus.php
index 4e8c8a0d0c158..bfe73a03464a7 100644
--- a/libraries/joomla/google/data/plus.php
+++ b/libraries/joomla/google/data/plus.php
@@ -19,21 +19,21 @@
 class JGoogleDataPlus extends JGoogleData
 {
 	/**
-	* @var    JGoogleDataPlusPeople  Google+ API object for people.
-	* @since  12.3
-	*/
+	 * @var    JGoogleDataPlusPeople  Google+ API object for people.
+	 * @since  12.3
+	 */
 	protected $people;
 
 	/**
-	* @var    JGoogleDataPlusActivities  Google+ API object for people.
-	* @since  12.3
-	*/
+	 * @var    JGoogleDataPlusActivities  Google+ API object for people.
+	 * @since  12.3
+	 */
 	protected $activities;
 
 	/**
-	* @var    JGoogleDataPlusComments  Google+ API object for people.
-	* @since  12.3
-	*/
+	 * @var    JGoogleDataPlusComments  Google+ API object for people.
+	 * @since  12.3
+	 */
 	protected $comments;
 
 	/**
@@ -75,6 +75,7 @@ public function __get($name)
 				{
 					$this->people = new JGoogleDataPlusPeople($this->options, $this->auth);
 				}
+
 				return $this->people;
 
 			case 'activities':
@@ -82,6 +83,7 @@ public function __get($name)
 				{
 					$this->activities = new JGoogleDataPlusActivities($this->options, $this->auth);
 				}
+
 				return $this->activities;
 
 			case 'comments':
@@ -89,6 +91,7 @@ public function __get($name)
 				{
 					$this->comments = new JGoogleDataPlusComments($this->options, $this->auth);
 				}
+
 				return $this->comments;
 		}
 	}
diff --git a/libraries/joomla/google/embed/maps.php b/libraries/joomla/google/embed/maps.php
index 8ff2d4d7c4fc2..ce05e1e5fa953 100644
--- a/libraries/joomla/google/embed/maps.php
+++ b/libraries/joomla/google/embed/maps.php
@@ -18,7 +18,6 @@
  */
 class JGoogleEmbedMaps extends JGoogleEmbed
 {
-
 	/**
 	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
 	 * @since  12.3
@@ -36,7 +35,7 @@ class JGoogleEmbedMaps extends JGoogleEmbed
 	 */
 	public function __construct(JRegistry $options = null, JUri $uri = null, JHttp $http = null)
 	{
-		parent::__construct($options = null, $uri = null);
+		parent::__construct($options, $uri);
 		$this->http = $http ? $http : new JHttp($this->options);
 	}
 
@@ -297,6 +296,7 @@ public function setCenter($location, $title = true, $markeroptions = array())
 			{
 				return false;
 			}
+
 			$location = $marker['loc'];
 		}
 		elseif (is_string($location))
@@ -549,11 +549,6 @@ public function setAutoload($type = 'onload')
 	 */
 	public function getHeader()
 	{
-		if (!$this->getOption('key'))
-		{
-			throw new UnexpectedValueException('A Google Maps API key is required.');
-		}
-
 		$zoom = $this->getZoom();
 		$center = $this->getCenter();
 		$maptype = $this->getMapType();
@@ -598,13 +593,14 @@ public function getHeader()
 			$onload = "function() {";
 			$onload .= 'var script = document.createElement("script");';
 			$onload .= 'script.type = "text/javascript";';
-			$onload .= "script.src = '{$scheme}://maps.googleapis.com/maps/api/js?key={$key}&sensor={$sensor}&callback={$asynccallback}';";
+			$onload .= "script.src = '{$scheme}://maps.googleapis.com/maps/api/js?" . ($key ? "key={$key}&" : "")
+				. "sensor={$sensor}&callback={$asynccallback}';";
 			$onload .= 'document.body.appendChild(script);';
 			$onload .= '}';
 		}
 		else
 		{
-			$output = "<script type='text/javascript' src='{$scheme}://maps.googleapis.com/maps/api/js?key={$key}&sensor={$sensor}'>";
+			$output = "<script type='text/javascript' src='{$scheme}://maps.googleapis.com/maps/api/js?" . ($key ? "key={$key}&" : "") . "sensor={$sensor}'>";
 			$output .= '</script>';
 			$output .= '<script type="text/javascript">';
 
@@ -688,6 +684,7 @@ public function geocodeAddress($address)
 		{
 			throw new RuntimeException('Invalid json received geocoding address: ' . $response->body . '.');
 		}
+
 		if ($data['status'] != 'OK')
 		{
 			return null;
diff --git a/libraries/joomla/google/google.php b/libraries/joomla/google/google.php
index 5d959298d261e..0164adb66f63b 100644
--- a/libraries/joomla/google/google.php
+++ b/libraries/joomla/google/google.php
@@ -76,10 +76,12 @@ public function data($name, $options = null, $auth = null)
 		{
 			$options = $this->options;
 		}
+
 		if ($this->auth && !$auth)
 		{
 			$auth = $this->auth;
 		}
+
 		switch ($name)
 		{
 			case 'plus':
@@ -115,6 +117,7 @@ public function embed($name, $options = null)
 		{
 			$options = $this->options;
 		}
+
 		switch ($name)
 		{
 			case 'maps':
diff --git a/libraries/joomla/grid/grid.php b/libraries/joomla/grid/grid.php
index 948bed082eefa..d31b636e8afbd 100644
--- a/libraries/joomla/grid/grid.php
+++ b/libraries/joomla/grid/grid.php
@@ -99,6 +99,7 @@ public function setTableOptions($options = array(), $replace = false)
 		{
 			$this->options = array_merge($this->options, $options);
 		}
+
 		return $this;
 	}
 
@@ -154,6 +155,7 @@ public function getColumns()
 	public function deleteColumn($name)
 	{
 		$index = array_search($name, $this->columns);
+
 		if ($index !== false)
 		{
 			unset($this->columns[$index]);
@@ -195,6 +197,7 @@ public function addRow($options = array(), $special = false)
 	{
 		$this->rows[]['_row'] = $options;
 		$this->activeRow = count($this->rows) - 1;
+
 		if ($special)
 		{
 			if ($special === 1)
@@ -262,6 +265,7 @@ public function getActiveRow()
 	public function setActiveRow($id)
 	{
 		$this->activeRow = (int) $id;
+
 		return $this;
 	}
 
@@ -344,6 +348,7 @@ public function getRows($special = false)
 				return $this->specialRows['footer'];
 			}
 		}
+
 		return array_diff(array_keys($this->rows), array_merge($this->specialRows['header'], $this->specialRows['footer']));
 	}
 
@@ -402,12 +407,14 @@ public function toString()
 		}
 
 		$ids = array_diff(array_keys($this->rows), array_merge($this->specialRows['header'], $this->specialRows['footer']));
+
 		if (count($ids))
 		{
 			$output[] = $this->renderArea($ids);
 		}
 
 		$output[] = '</table>';
+
 		return implode('', $output);
 	}
 
@@ -426,9 +433,11 @@ protected function renderArea($ids, $area = 'tbody', $cell = 'td')
 	{
 		$output = array();
 		$output[] = '<' . $area . ">\n";
+
 		foreach ($ids as $id)
 		{
 			$output[] = "\t<tr" . $this->renderAttributes($this->rows[$id]['_row']) . ">\n";
+
 			foreach ($this->getColumns() as $name)
 			{
 				if (isset($this->rows[$id][$name]))
@@ -440,6 +449,7 @@ protected function renderArea($ids, $area = 'tbody', $cell = 'td')
 
 			$output[] = "\t</tr>\n";
 		}
+
 		$output[] = '</' . $area . '>';
 
 		return implode('', $output);
@@ -460,11 +470,14 @@ protected function renderAttributes($attributes)
 		{
 			return '';
 		}
+
 		$return = array();
+
 		foreach ($attributes as $key => $option)
 		{
 			$return[] = $key . '="' . $option . '"';
 		}
+
 		return ' ' . implode(' ', $return);
 	}
 }
diff --git a/libraries/joomla/http/factory.php b/libraries/joomla/http/factory.php
index 3981186581f6d..7c99b75c4fbff 100644
--- a/libraries/joomla/http/factory.php
+++ b/libraries/joomla/http/factory.php
@@ -119,7 +119,10 @@ public static function getHttpTransports()
 				$names[] = substr($fileName, 0, strrpos($fileName, '.'));
 			}
 		}
-		
+
+		// Keep alphabetical order across all environments
+		sort($names);
+
 		// If curl is available set it to the first position
 		if ($key = array_search('curl', $names))
 		{
diff --git a/libraries/joomla/http/transport/cacert.pem b/libraries/joomla/http/transport/cacert.pem
index ea32571072534..36875beaca6dd 100644
--- a/libraries/joomla/http/transport/cacert.pem
+++ b/libraries/joomla/http/transport/cacert.pem
@@ -1,18 +1,21 @@
 ##
-## ca-bundle.crt -- Bundle of CA Root Certificates
+## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Jul 15 08:33:20 2014
+## Certificate data from Mozilla downloaded on: Wed Sep  3 03:12:03 2014
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
 ## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://mxr.mozilla.org/mozilla-release/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
 ##
 ## It contains the certificates in PEM format and therefore
 ## can be directly used with curl / libcurl / php_curl, or with
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
+## Conversion done with mk-ca-bundle.pl verison 1.22.
+## SHA1: c4540021427a6fa29e5f50db9f12d48c97d33889
+##
 
 
 GTE CyberTrust Global Root
@@ -90,22 +93,6 @@ BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
 70+sB3c4
 -----END CERTIFICATE-----
 
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
-TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
-WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
-Tqj/ZA1k
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority - G2
 ============================================================
 -----BEGIN CERTIFICATE-----
@@ -168,63 +155,6 @@ BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
 TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
 -----END CERTIFICATE-----
 
-ValiCert Class 1 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
-MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
-GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
-DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
-lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
-icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
-Orf1LXLI
------END CERTIFICATE-----
-
-ValiCert Class 2 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
-CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
-ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
-SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
-UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
-W9ViH0Pd
------END CERTIFICATE-----
-
-RSA Root Certificate 1
-======================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
-3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
-BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
-3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
-V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
-on+jjBXu
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority - G3
 ============================================================
 -----BEGIN CERTIFICATE-----
@@ -273,33 +203,6 @@ RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
 UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
 -----END CERTIFICATE-----
 
-Entrust.net Secure Server CA
-============================
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
-cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
-ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
-A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
-eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
-dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
-aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
-gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
-ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
-CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
-dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
-NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
-HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
-BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
-Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
-n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
-
 Entrust.net Premium 2048 Secure Server CA
 =========================================
 -----BEGIN CERTIFICATE-----
@@ -953,30 +856,6 @@ nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
 iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
 -----END CERTIFICATE-----
 
-TDC Internet Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE
-ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx
-NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu
-ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j
-xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL
-znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc
-5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6
-otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI
-AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM
-VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM
-MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC
-AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe
-UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G
-CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m
-gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
-2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb
-O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU
-Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l
------END CERTIFICATE-----
-
 UTN DATACorp SGC Root CA
 ========================
 -----BEGIN CERTIFICATE-----
@@ -1117,64 +996,6 @@ KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
 8CgHrTwXZoi1/baI
 -----END CERTIFICATE-----
 
-NetLock Business (Class B) Root
-===============================
------BEGIN CERTIFICATE-----
-MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
-VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
-VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
-bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
-VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
-o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
-1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
-HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
-RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
-dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
-ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
-c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
-YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
-c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
-Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
-bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
-IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
-YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
-cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
-43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
-stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
------END CERTIFICATE-----
-
-NetLock Express (Class C) Root
-==============================
------BEGIN CERTIFICATE-----
-MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
-KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
-BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
-ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
-W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
-euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
-DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
-RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
-YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
-IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
-aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
-ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
-ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
-dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
-emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
-IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
-UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
-YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
-xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
-gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1929,40 +1750,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
-======================================
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
-AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
-LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
-HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
-U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
-IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
-yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
-2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
-4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
-2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
-8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
-HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
-Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
-5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
-czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
-ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
-BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
-cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
-AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
-EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
-/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
-MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
-3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
-eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
-/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
-RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
-Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
------END CERTIFICATE-----
-
 TC TrustCenter Class 2 CA II
 ============================
 -----BEGIN CERTIFICATE-----
@@ -2610,22 +2397,6 @@ MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
 tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
 -----END CERTIFICATE-----
 
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
-CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
-bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
-D/xwzoiQ
------END CERTIFICATE-----
-
 Microsec e-Szigno Root CA 2009
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -3864,3 +3635,260 @@ TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
 61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
 3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
 -----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+WoSign
+======
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
+BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
+CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
+2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
+KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
++ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
+EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
+lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
+8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
+yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
+AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
+8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
+T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
+y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
+2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
+5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
+EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
+mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
+kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
+kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
+
+WoSign China
+============
+-----BEGIN CERTIFICATE-----
+MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
+geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
+VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
+8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
+uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
+dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
+Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
+b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
+76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
++Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
+yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
+GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
+A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
+yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
+r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
+j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
+kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
+qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
+jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
+ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
+T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
+kI26oQ==
+-----END CERTIFICATE-----
diff --git a/libraries/joomla/http/transport/socket.php b/libraries/joomla/http/transport/socket.php
index f32a520b0ae49..3538eb4eee9d6 100644
--- a/libraries/joomla/http/transport/socket.php
+++ b/libraries/joomla/http/transport/socket.php
@@ -142,7 +142,15 @@ public function request($method, JUri $uri, $data = null, array $headers = null,
 			$content .= fgets($connection, 4096);
 		}
 
-		return $this->getResponse($content);
+		$content = $this->getResponse($content);
+
+		// Follow Http redirects
+		if ($content->code >= 301 && $content->code < 400 && isset($content->headers['Location']))
+		{
+			return $this->request($method, new JUri($content->headers['Location']), $data, $headers, $timeout, $userAgent);
+		}
+
+		return $content;
 	}
 
 	/**
@@ -308,5 +316,4 @@ public static function isSupported()
 	{
 		return function_exists('fsockopen') && is_callable('fsockopen');
 	}
-
 }
diff --git a/libraries/joomla/http/transport/stream.php b/libraries/joomla/http/transport/stream.php
index d76ae57756fcc..ab0a1fc4e7468 100644
--- a/libraries/joomla/http/transport/stream.php
+++ b/libraries/joomla/http/transport/stream.php
@@ -125,7 +125,16 @@ public function request($method, JUri $uri, $data = null, array $headers = null,
 		$options['follow_location'] = (int) $this->options->get('follow_location', 1);
 
 		// Create the stream context for the request.
-		$context = stream_context_create(array('http' => $options));
+		$context = stream_context_create(
+			array(
+				'http' => $options,
+				'ssl' => array(
+					'verify_peer'   => true,
+					'cafile'        => __DIR__ . '/cacert.pem',
+					'verify_depth'  => 5,
+				)
+			)
+		);
 
 		// Capture PHP errors
 		$php_errormsg = '';
@@ -175,7 +184,6 @@ public function request($method, JUri $uri, $data = null, array $headers = null,
 		}
 
 		return $this->getResponse($headers, $content);
-
 	}
 
 	/**
diff --git a/libraries/joomla/image/image.php b/libraries/joomla/image/image.php
index 8adf5310e5e0c..6343c8c1a30d8 100644
--- a/libraries/joomla/image/image.php
+++ b/libraries/joomla/image/image.php
@@ -698,11 +698,33 @@ public function resize($width, $height, $createNew = true, $scaleMethod = self::
 			imagecolortransparent($handle, $color);
 			imagefill($handle, 0, 0, $color);
 
-			imagecopyresized($handle, $this->handle, $offset->x, $offset->y, 0, 0, $dimensions->width, $dimensions->height, $this->getWidth(), $this->getHeight());
+			imagecopyresized(
+				$handle,
+				$this->handle,
+				$offset->x,
+				$offset->y,
+				0,
+				0,
+				$dimensions->width,
+				$dimensions->height,
+				$this->getWidth(),
+				$this->getHeight()
+			);
 		}
 		else
 		{
-			imagecopyresampled($handle, $this->handle, $offset->x, $offset->y, 0, 0, $dimensions->width, $dimensions->height, $this->getWidth(), $this->getHeight());
+			imagecopyresampled(
+				$handle,
+				$this->handle,
+				$offset->x,
+				$offset->y,
+				0,
+				0,
+				$dimensions->width,
+				$dimensions->height,
+				$this->getWidth(),
+				$this->getHeight()
+			);
 		}
 
 		// If we are resizing to a new image, create a new JImage object.
@@ -733,7 +755,7 @@ public function resize($width, $height, $createNew = true, $scaleMethod = self::
 	 *
 	 * @param   integer  $width      The desired width of the image in pixels or a percentage.
 	 * @param   integer  $height     The desired height of the image in pixels or a percentage.
-	 * @param   integer  $createNew  If true the current image will be cloned, resized, cropped and returned.
+	 * @param   boolean  $createNew  If true the current image will be cloned, resized, cropped and returned.
 	 *
 	 * @return  object  JImage Object for chaining.
 	 *
@@ -744,16 +766,19 @@ public function cropResize($width, $height, $createNew = true)
 		$width   = $this->sanitizeWidth($width, $height);
 		$height  = $this->sanitizeHeight($height, $width);
 
+		$resizewidth = $width;
+		$resizeheight = $height;
+
 		if (($this->getWidth() / $width) < ($this->getHeight() / $height))
 		{
-			$this->resize($width, 0, false);
+			$resizeheight = 0;
 		}
 		else
 		{
-			$this->resize(0, $height, false);
+			$resizewidth = 0;
 		}
 
-		return $this->crop($width, $height, null, null, $createNew);
+		return $this->resize($resizewidth, $resizeheight, $createNew)->crop($width, $height, null, null, false);
 	}
 
 	/**
diff --git a/libraries/joomla/input/files.php b/libraries/joomla/input/files.php
index d4c8a12aa6521..bc24a5748bfe3 100644
--- a/libraries/joomla/input/files.php
+++ b/libraries/joomla/input/files.php
@@ -83,7 +83,6 @@ public function get($name, $default = null, $filter = 'cmd')
 		}
 
 		return $default;
-
 	}
 
 	/**
@@ -105,6 +104,7 @@ protected function decodeData(array $data)
 			{
 				$result[$k] = $this->decodeData(array($data[0][$k], $data[1][$k], $data[2][$k], $data[3][$k], $data[4][$k]));
 			}
+
 			return $result;
 		}
 
diff --git a/libraries/joomla/keychain/keychain.php b/libraries/joomla/keychain/keychain.php
index c2acea1089f56..25d7025950b5c 100644
--- a/libraries/joomla/keychain/keychain.php
+++ b/libraries/joomla/keychain/keychain.php
@@ -86,11 +86,12 @@ public function deleteValue($path)
 			// Traverse the registry to find the correct node for the result.
 			for ($i = 0, $n = count($nodes) - 1; $i < $n; $i++)
 			{
-			if (!isset($node->$nodes[$i]) && ($i != $n))
-			{
-			$node->$nodes[$i] = new stdClass;
-			}
-			$node = $node->$nodes[$i];
+				if (!isset($node->$nodes[$i]) && ($i != $n))
+				{
+					$node->$nodes[$i] = new stdClass;
+				}
+
+				$node = $node->$nodes[$i];
 			}
 
 			// Get the old value if exists so we can return it
@@ -119,6 +120,7 @@ public function loadKeychain($keychainFile, $passphraseFile, $publicKeyFile)
 		{
 			throw new RuntimeException('Attempting to load non-existent keychain file');
 		}
+
 		$passphrase = $this->getPassphraseFromFile($passphraseFile, $publicKeyFile);
 
 		$cleartext = openssl_decrypt(file_get_contents($keychainFile), $this->method, $passphrase, true, $this->iv);
@@ -175,6 +177,7 @@ protected function getPassphraseFromFile($passphraseFile, $publicKeyFile)
 		{
 			throw new RuntimeException('Missing public key file');
 		}
+
 		$publicKey = openssl_get_publickey(file_get_contents($publicKeyFile));
 
 		if (!$publicKey)
@@ -186,12 +189,14 @@ protected function getPassphraseFromFile($passphraseFile, $publicKeyFile)
 		{
 			throw new RuntimeException('Missing passphrase file');
 		}
+
 		$passphrase = '';
 
 		if (!openssl_public_decrypt(file_get_contents($passphraseFile), $passphrase, $publicKey))
 		{
 			throw new RuntimeException('Failed to decrypt passphrase file');
 		}
+
 		return $passphrase;
 	}
 }
diff --git a/libraries/joomla/language/transliterate.php b/libraries/joomla/language/transliterate.php
index 72d5432b9e4b7..83df5cda8da52 100644
--- a/libraries/joomla/language/transliterate.php
+++ b/libraries/joomla/language/transliterate.php
@@ -23,7 +23,7 @@ class JLanguageTransliterate
 	 * Returns strings transliterated from UTF-8 to Latin
 	 *
 	 * @param   string   $string  String to transliterate
-	 * @param   boolean  $case    Optionally specify upper or lower case. Default to null.
+	 * @param   integer  $case    Optionally specify upper or lower case. Default to null.
 	 *
 	 * @return  string  Transliterated string
 	 *
@@ -258,6 +258,7 @@ public static function utf8_latin_to_ascii($string, $case = 0)
 					'Ĕ' => 'E',
 					'Œ' => 'Oe');
 			}
+
 			$string = str_replace(array_keys($UTF8_UPPER_ACCENTS), array_values($UTF8_UPPER_ACCENTS), $string);
 		}
 
diff --git a/libraries/joomla/linkedin/companies.php b/libraries/joomla/linkedin/companies.php
index 2877a9b5f64bb..52418147b867f 100644
--- a/libraries/joomla/linkedin/companies.php
+++ b/libraries/joomla/linkedin/companies.php
@@ -201,6 +201,7 @@ public function search($fields = null, $keywords = null, $hq = false, $facets =
 		if ($facet)
 		{
 			$data['facet'] = array();
+
 			for ($i = 0; $i < count($facet); $i++)
 			{
 				if ($facet[$i])
@@ -209,22 +210,27 @@ public function search($fields = null, $keywords = null, $hq = false, $facets =
 					{
 						$data['facet'][] = 'location,' . $facet[$i];
 					}
+
 					if ($i == 1)
 					{
 						$data['facet'][] = 'industry,' . $facet[$i];
 					}
+
 					if ($i == 2)
 					{
 						$data['facet'][] = 'network,' . $facet[$i];
 					}
+
 					if ($i == 3)
 					{
 						$data['facet'][] = 'company-size,' . $facet[$i];
 					}
+
 					if ($i == 4)
 					{
 						$data['facet'][] = 'num-followers-range,' . $facet[$i];
 					}
+
 					if ($i == 5)
 					{
 						$data['facet'][] = 'fortune,' . $facet[$i];
diff --git a/libraries/joomla/linkedin/jobs.php b/libraries/joomla/linkedin/jobs.php
index 41cfd7fb6342e..9ebf9cc7ea713 100644
--- a/libraries/joomla/linkedin/jobs.php
+++ b/libraries/joomla/linkedin/jobs.php
@@ -311,6 +311,7 @@ public function search($fields = null, $keywords = null, $company_name = null, $
 		if ($facet)
 		{
 			$data['facet'] = array();
+
 			for ($i = 0; $i < count($facet); $i++)
 			{
 				if ($facet[$i])
@@ -319,22 +320,27 @@ public function search($fields = null, $keywords = null, $company_name = null, $
 					{
 						$data['facet'][] = 'company,' . $this->oauth->safeEncode($facet[$i]);
 					}
+
 					if ($i == 1)
 					{
 						$data['facet'][] = 'date-posted,' . $facet[$i];
 					}
+
 					if ($i == 2)
 					{
 						$data['facet'][] = 'location,' . $facet[$i];
 					}
+
 					if ($i == 3)
 					{
 						$data['facet'][] = 'job-function,' . $this->oauth->safeEncode($facet[$i]);
 					}
+
 					if ($i == 4)
 					{
 						$data['facet'][] = 'industry,' . $facet[$i];
 					}
+
 					if ($i == 5)
 					{
 						$data['facet'][] = 'salary,' . $facet[$i];
diff --git a/libraries/joomla/linkedin/oauth.php b/libraries/joomla/linkedin/oauth.php
index 5f5feeb4ae260..be92cadba230e 100644
--- a/libraries/joomla/linkedin/oauth.php
+++ b/libraries/joomla/linkedin/oauth.php
@@ -20,9 +20,9 @@
 class JLinkedinOauth extends JOAuth1Client
 {
 	/**
-	* @var    JRegistry  Options for the JLinkedinOauth object.
-	* @since  13.1
-	*/
+	 * @var    JRegistry  Options for the JLinkedinOauth object.
+	 * @since  13.1
+	 */
 	protected $options;
 
 	/**
diff --git a/libraries/joomla/linkedin/people.php b/libraries/joomla/linkedin/people.php
index 970d7df2e5a65..7c750cf9eb1d5 100644
--- a/libraries/joomla/linkedin/people.php
+++ b/libraries/joomla/linkedin/people.php
@@ -75,6 +75,7 @@ public function getProfile($id = null, $url = null, $fields = null, $type = 'sta
 
 		// Check if language is specified.
 		$header = array();
+
 		if ($language)
 		{
 			$header = array('Accept-Language' => $language);
@@ -290,6 +291,7 @@ public function search($fields = null, $keywords = null, $first_name = null, $la
 		if ($facet)
 		{
 			$data['facet'] = array();
+
 			for ($i = 0; $i < count($facet); $i++)
 			{
 				if ($facet[$i])
@@ -298,26 +300,32 @@ public function search($fields = null, $keywords = null, $first_name = null, $la
 					{
 						$data['facet'][] = 'location,' . $facet[$i];
 					}
+
 					if ($i == 1)
 					{
 						$data['facet'][] = 'industry,' . $facet[$i];
 					}
+
 					if ($i == 2)
 					{
 						$data['facet'][] = 'network,' . $facet[$i];
 					}
+
 					if ($i == 3)
 					{
 						$data['facet'][] = 'language,' . $facet[$i];
 					}
+
 					if ($i == 4)
 					{
 						$data['facet'][] = 'current-company,' . $facet[$i];
 					}
+
 					if ($i == 5)
 					{
 						$data['facet'][] = 'past-company,' . $facet[$i];
 					}
+
 					if ($i == 6)
 					{
 						$data['facet'][] = 'school,' . $facet[$i];
diff --git a/libraries/joomla/log/entry.php b/libraries/joomla/log/entry.php
index 4c2e9b2f179d7..9497582553c3c 100644
--- a/libraries/joomla/log/entry.php
+++ b/libraries/joomla/log/entry.php
@@ -85,6 +85,7 @@ public function __construct($message, $priority = JLog::INFO, $category = '', $d
 		{
 			$priority = JLog::INFO;
 		}
+
 		$this->priority = $priority;
 
 		// Sanitize category if it exists.
diff --git a/libraries/joomla/log/log.php b/libraries/joomla/log/log.php
index 638febf0294db..fe7e4f5491d57 100644
--- a/libraries/joomla/log/log.php
+++ b/libraries/joomla/log/log.php
@@ -178,6 +178,7 @@ public static function addLogger(array $options, $priorities = self::ALL, $categ
 		{
 			$options['logger'] = 'formattedtext';
 		}
+
 		$options['logger'] = strtolower($options['logger']);
 
 		// Special case - if a Closure object is sent as the callback (in case of JLogLoggerCallback)
@@ -247,7 +248,6 @@ protected function addLogEntry(JLogEntry $entry)
 			// Attempt to instantiate the logger object if it doesn't already exist.
 			if (empty($this->loggers[$signature]))
 			{
-
 				$class = 'JLogLogger' . ucfirst($this->configurations[$signature]['logger']);
 
 				if (class_exists($class))
@@ -261,7 +261,7 @@ protected function addLogEntry(JLogEntry $entry)
 			}
 
 			// Add the entry to the logger.
-			$this->loggers[$signature]->addEntry(clone($entry));
+			$this->loggers[$signature]->addEntry(clone $entry);
 		}
 	}
 
diff --git a/libraries/joomla/log/logger/formattedtext.php b/libraries/joomla/log/logger/formattedtext.php
index 55c06e621449e..a17dedfc7025e 100644
--- a/libraries/joomla/log/logger/formattedtext.php
+++ b/libraries/joomla/log/logger/formattedtext.php
@@ -34,7 +34,7 @@ class JLogLoggerFormattedtext extends JLogLogger
 	 * in all caps and be within curly brackets eg. {FOOBAR}.
 	 * @since  11.1
 	 */
-	protected $format = '{DATETIME}	{PRIORITY}	{CATEGORY}	{MESSAGE}';
+	protected $format = '{DATETIME}	{PRIORITY} {CLIENTIP}	{CATEGORY}	{MESSAGE}';
 
 	/**
 	 * @var    array  The parsed fields from the format string.
@@ -125,7 +125,6 @@ public function addEntry(JLogEntry $entry)
 		// Set some default field values if not already set.
 		if (!isset($entry->clientIP))
 		{
-
 			// Check for proxies as well.
 			if (isset($_SERVER['REMOTE_ADDR']))
 			{
@@ -144,7 +143,6 @@ public function addEntry(JLogEntry $entry)
 		// If the time field is missing or the date field isn't only the date we need to rework it.
 		if ((strlen($entry->date) != 10) || !isset($entry->time))
 		{
-
 			// Get the date and time strings in GMT.
 			$entry->datetime = $entry->date->toISO8601();
 			$entry->time = $entry->date->format('H:i:s', false);
@@ -192,6 +190,7 @@ protected function generateFileHeader()
 			$head[] = '#';
 			$head[] = '#<?php die(\'Forbidden.\'); ?>';
 		}
+
 		$head[] = '#Date: ' . gmdate('Y-m-d H:i:s') . ' UTC';
 		$head[] = '#Software: ' . JPlatform::getLongVersion();
 		$head[] = '';
@@ -218,7 +217,6 @@ protected function initFile()
 		// If the file doesn't already exist we need to create it and generate the file header.
 		if (!is_file($this->path))
 		{
-
 			// Make sure the folder exists in which to create the log file.
 			JFolder::create(dirname($this->path));
 
@@ -235,6 +233,7 @@ protected function initFile()
 		{
 			throw new RuntimeException('Cannot open file for writing log');
 		}
+
 		if ($head)
 		{
 			if (!fwrite($this->file, $head))
diff --git a/libraries/joomla/log/logger/syslog.php b/libraries/joomla/log/logger/syslog.php
index c8b2da44bd93c..a8a6aed890f30 100644
--- a/libraries/joomla/log/logger/syslog.php
+++ b/libraries/joomla/log/logger/syslog.php
@@ -82,6 +82,7 @@ public function __construct(array &$options)
 		{
 			$sysOptions = $sysOptions | LOG_PID;
 		}
+
 		if ($this->options['sys_use_stderr'])
 		{
 			$sysOptions = $sysOptions | LOG_PERROR;
diff --git a/libraries/joomla/mediawiki/http.php b/libraries/joomla/mediawiki/http.php
index 8636e2abeec7c..ca0d31b059b6e 100644
--- a/libraries/joomla/mediawiki/http.php
+++ b/libraries/joomla/mediawiki/http.php
@@ -19,13 +19,13 @@
 class JMediawikiHttp extends JHttp
 {
 	/**
-     * Constructor.
-     *
-     * @param   JRegistry       $options    Client options object.
-     * @param   JHttpTransport  $transport  The HTTP transport object.
-     *
-     * @since   12.3
-     */
+	 * Constructor.
+	 *
+	 * @param   JRegistry       $options    Client options object.
+	 * @param   JHttpTransport  $transport  The HTTP transport object.
+	 *
+	 * @since   12.3
+	 */
 	public function __construct(JRegistry $options = null, JHttpTransport $transport = null)
 	{
 		// Override the JHttp contructor to use JHttpTransportStream.
diff --git a/libraries/joomla/mediawiki/images.php b/libraries/joomla/mediawiki/images.php
index 4786da46ac06c..a81577e1e5704 100644
--- a/libraries/joomla/mediawiki/images.php
+++ b/libraries/joomla/mediawiki/images.php
@@ -18,20 +18,19 @@
  */
 class JMediawikiImages extends JMediawikiObject
 {
-
 	/**
-     * Method to get all images contained on the given page(s).
-     *
-     * @param   array    $titles         Page titles to retrieve images.
-     * @param   integer  $imagelimit     How many images to return.
-     * @param   boolean  $imagecontinue  When more results are available, use this to continue.
-     * @param   integer  $imimages       Only list these images.
-     * @param   string   $imdir          The direction in which to list.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get all images contained on the given page(s).
+	 *
+	 * @param   array    $titles         Page titles to retrieve images.
+	 * @param   integer  $imagelimit     How many images to return.
+	 * @param   boolean  $imagecontinue  When more results are available, use this to continue.
+	 * @param   integer  $imimages       Only list these images.
+	 * @param   string   $imdir          The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getImages(array $titles, $imagelimit = null, $imagecontinue = null, $imimages = null, $imdir = null)
 	{
 		// Build the request.
@@ -67,14 +66,14 @@ public function getImages(array $titles, $imagelimit = null, $imagecontinue = nu
 	}
 
 	/**
-     * Method to get all images contained on the given page(s).
-     *
-     * @param   array  $titles  Page titles to retrieve links.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get all images contained on the given page(s).
+	 *
+	 * @param   array  $titles  Page titles to retrieve links.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getImagesUsed(array $titles)
 	{
 		// Build the request.
@@ -90,22 +89,22 @@ public function getImagesUsed(array $titles)
 	}
 
 	/**
-     * Method to get all image information and upload history.
-     *
-     * @param   array    $liprop             What image information to get.
-     * @param   integer  $lilimit            How many image revisions to return.
-     * @param   string   $listart            Timestamp to start listing from.
-     * @param   string   $liend              Timestamp to stop listing at.
-     * @param   integer  $liurlwidth         URL to an image scaled to this width will be returned..
-     * @param   integer  $liurlheight        URL to an image scaled to this height will be returned.
-     * @param   string   $limetadataversion  Version of metadata to use.
-     * @param   string   $liurlparam         A handler specific parameter string.
-     * @param   boolean  $licontinue         When more results are available, use this to continue.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get all image information and upload history.
+	 *
+	 * @param   array    $liprop             What image information to get.
+	 * @param   integer  $lilimit            How many image revisions to return.
+	 * @param   string   $listart            Timestamp to start listing from.
+	 * @param   string   $liend              Timestamp to stop listing at.
+	 * @param   integer  $liurlwidth         URL to an image scaled to this width will be returned..
+	 * @param   integer  $liurlheight        URL to an image scaled to this height will be returned.
+	 * @param   string   $limetadataversion  Version of metadata to use.
+	 * @param   string   $liurlparam         A handler specific parameter string.
+	 * @param   boolean  $licontinue         When more results are available, use this to continue.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getImageInfo(array $liprop = null, $lilimit = null, $listart = null, $liend = null, $liurlwidth = null,
 		$liurlheight = null, $limetadataversion = null, $liurlparam = null, $licontinue = null)
 	{
@@ -164,24 +163,24 @@ public function getImageInfo(array $liprop = null, $lilimit = null, $listart = n
 	}
 
 	/**
-     * Method to enumerate all images.
-     *
-     * @param   string   $aifrom        The image title to start enumerating from.
-     * @param   string   $aito          The image title to stop enumerating at.
-     * @param   string   $aiprefix      Search for all image titles that begin with this value.
-     * @param   integer  $aiminsize     Limit to images with at least this many bytes.
-     * @param   integer  $aimaxsize     Limit to images with at most this many bytes.
-     * @param   integer  $ailimit       How many images in total to return.
-     * @param   string   $aidir         The direction in which to list.
-     * @param   string   $aisha1        SHA1 hash of image.
-     * @param   string   $aisha1base36  SHA1 hash of image in base 36.
-     * @param   array    $aiprop        What image information to get.
-     * @param   string   $aimime        What MIME type to search for.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to enumerate all images.
+	 *
+	 * @param   string   $aifrom        The image title to start enumerating from.
+	 * @param   string   $aito          The image title to stop enumerating at.
+	 * @param   string   $aiprefix      Search for all image titles that begin with this value.
+	 * @param   integer  $aiminsize     Limit to images with at least this many bytes.
+	 * @param   integer  $aimaxsize     Limit to images with at most this many bytes.
+	 * @param   integer  $ailimit       How many images in total to return.
+	 * @param   string   $aidir         The direction in which to list.
+	 * @param   string   $aisha1        SHA1 hash of image.
+	 * @param   string   $aisha1base36  SHA1 hash of image in base 36.
+	 * @param   array    $aiprop        What image information to get.
+	 * @param   string   $aimime        What MIME type to search for.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function enumerateImages($aifrom = null, $aito = null, $aiprefix = null, $aiminsize = null, $aimaxsize = null, $ailimit = null,
 		$aidir = null, $aisha1 = null, $aisha1base36 = null, array $aiprop = null, $aimime = null)
 	{
@@ -222,6 +221,7 @@ public function enumerateImages($aifrom = null, $aito = null, $aiprefix = null,
 		{
 			$path .= '&aidir=' . $aidir;
 		}
+
 		if (isset($aisha1))
 		{
 			$path .= '&aisha1=' . $aisha1;
diff --git a/libraries/joomla/mediawiki/links.php b/libraries/joomla/mediawiki/links.php
index 79c2d8ac17ba8..d3fc82433e7be 100644
--- a/libraries/joomla/mediawiki/links.php
+++ b/libraries/joomla/mediawiki/links.php
@@ -18,21 +18,20 @@
  */
 class JMediawikiLinks extends JMediawikiObject
 {
-
 	/**
-     * Method to return all links from the given page(s).
-     *
-     * @param   array   $titles       Page titles to retrieve links.
-     * @param   array   $plnamespace  Namespaces to get links.
-     * @param   string  $pllimit      Number of links to return.
-     * @param   string  $plcontinue   Continue when more results are available.
-     * @param   array   $pltitles     List links to these titles.
-     * @param   string  $pldir        Direction of listing.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to return all links from the given page(s).
+	 *
+	 * @param   array   $titles       Page titles to retrieve links.
+	 * @param   array   $plnamespace  Namespaces to get links.
+	 * @param   string  $pllimit      Number of links to return.
+	 * @param   string  $plcontinue   Continue when more results are available.
+	 * @param   array   $pltitles     List links to these titles.
+	 * @param   string  $pldir        Direction of listing.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getLinks(array $titles, array $plnamespace = null, $pllimit = null, $plcontinue = null, array $pltitles = null, $pldir = null)
 	{
 		// Build the request.
@@ -73,14 +72,14 @@ public function getLinks(array $titles, array $plnamespace = null, $pllimit = nu
 	}
 
 	/**
-     * Method to return info about the link pages.
-     *
-     * @param   array  $titles  Page titles to retrieve links.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to return info about the link pages.
+	 *
+	 * @param   array  $titles  Page titles to retrieve links.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getLinksUsed(array $titles)
 	{
 		// Build the request.
@@ -96,20 +95,20 @@ public function getLinksUsed(array $titles)
 	}
 
 	/**
-     * Method to return all interwiki links from the given page(s).
-     *
-     * @param   array    $titles      Page titles to retrieve links.
-     * @param   boolean  $iwurl       Whether to get the full url.
-     * @param   integer  $iwlimit     Number of interwiki links to return.
-     * @param   boolean  $iwcontinue  When more results are available, use this to continue.
-     * @param   string   $iwprefix    Prefix for the interwiki.
-     * @param   string   $iwtitle     Interwiki link to search for.
-     * @param   string   $iwdir       The direction in which to list.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to return all interwiki links from the given page(s).
+	 *
+	 * @param   array    $titles      Page titles to retrieve links.
+	 * @param   boolean  $iwurl       Whether to get the full url.
+	 * @param   integer  $iwlimit     Number of interwiki links to return.
+	 * @param   boolean  $iwcontinue  When more results are available, use this to continue.
+	 * @param   string   $iwprefix    Prefix for the interwiki.
+	 * @param   string   $iwtitle     Interwiki link to search for.
+	 * @param   string   $iwdir       The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getIWLinks(array $titles, $iwurl = false, $iwlimit = null, $iwcontinue = false, $iwprefix = null, $iwtitle = null, $iwdir = null)
 	{
 		// Build the request.
@@ -155,20 +154,20 @@ public function getIWLinks(array $titles, $iwurl = false, $iwlimit = null, $iwco
 	}
 
 	/**
-     * Method to return all interlanguage links from the given page(s).
-     *
-     * @param   array    $titles      Page titles to retrieve links.
-     * @param   integer  $lllimit     Number of langauge links to return.
-     * @param   boolean  $llcontinue  When more results are available, use this to continue.
-     * @param   string   $llurl       Whether to get the full URL.
-     * @param   string   $lllang      Language code.
-     * @param   string   $lltitle     Link to search for.
-     * @param   string   $lldir       The direction in which to list.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to return all interlanguage links from the given page(s).
+	 *
+	 * @param   array    $titles      Page titles to retrieve links.
+	 * @param   integer  $lllimit     Number of langauge links to return.
+	 * @param   boolean  $llcontinue  When more results are available, use this to continue.
+	 * @param   string   $llurl       Whether to get the full URL.
+	 * @param   string   $lllang      Language code.
+	 * @param   string   $lltitle     Link to search for.
+	 * @param   string   $lldir       The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getLangLinks(array $titles, $lllimit = null, $llcontinue = false, $llurl = null, $lllang = null, $lltitle = null, $lldir = null)
 	{
 		// Build the request.
@@ -214,18 +213,18 @@ public function getLangLinks(array $titles, $lllimit = null, $llcontinue = false
 	}
 
 	/**
-     * Method to return all external urls from the given page(s).
-     *
-     * @param   array    $titles      Page titles to retrieve links.
-     * @param   integer  $ellimit     Number of links to return.
-     * @param   string   $eloffset    When more results are available, use this to continue.
-     * @param   string   $elprotocol  Protocol of the url.
-     * @param   string   $elquery     Search string without protocol.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to return all external urls from the given page(s).
+	 *
+	 * @param   array    $titles      Page titles to retrieve links.
+	 * @param   integer  $ellimit     Number of links to return.
+	 * @param   string   $eloffset    When more results are available, use this to continue.
+	 * @param   string   $elprotocol  Protocol of the url.
+	 * @param   string   $elquery     Search string without protocol.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getExtLinks(array $titles, $ellimit = null, $eloffset = null, $elprotocol = null, $elquery = null)
 	{
 		// Build the request.
@@ -261,21 +260,21 @@ public function getExtLinks(array $titles, $ellimit = null, $eloffset = null, $e
 	}
 
 	/**
-     * Method to enumerate all links that point to a given namespace.
-     *
-     * @param   boolean  $alcontinue   When more results are available, use this to continue.
-     * @param   string   $alfrom       Start listing at this title. The title need not exist.
-     * @param   string   $alto         The page title to stop enumerating at.
-     * @param   string   $alprefix     Search for all page titles that begin with this value.
-     * @param   string   $alunique     Only show unique links.
-     * @param   array    $alprop       What pieces of information to include.
-     * @param   string   $alnamespace  The namespace to enumerate.
-     * @param   integer  $allimit      Number of links to return.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to enumerate all links that point to a given namespace.
+	 *
+	 * @param   boolean  $alcontinue   When more results are available, use this to continue.
+	 * @param   string   $alfrom       Start listing at this title. The title need not exist.
+	 * @param   string   $alto         The page title to stop enumerating at.
+	 * @param   string   $alprefix     Search for all page titles that begin with this value.
+	 * @param   string   $alunique     Only show unique links.
+	 * @param   array    $alprop       What pieces of information to include.
+	 * @param   string   $alnamespace  The namespace to enumerate.
+	 * @param   integer  $allimit      Number of links to return.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function enumerateLinks($alcontinue = false, $alfrom = null, $alto = null, $alprefix = null, $alunique = null, array $alprop = null,
 		$alnamespace = null, $allimit = null)
 	{
diff --git a/libraries/joomla/mediawiki/mediawiki.php b/libraries/joomla/mediawiki/mediawiki.php
index 979ebe1868a1a..cb66a6c147d08 100644
--- a/libraries/joomla/mediawiki/mediawiki.php
+++ b/libraries/joomla/mediawiki/mediawiki.php
@@ -81,13 +81,13 @@ class JMediawiki
 	protected $search;
 
 	/**
-     * Constructor.
-     *
-     * @param   JRegistry       $options  MediaWiki options object.
-     * @param   JMediawikiHttp  $client   The HTTP client object.
-     *
-     * @since   12.3
-     */
+	 * Constructor.
+	 *
+	 * @param   JRegistry       $options  MediaWiki options object.
+	 * @param   JMediawikiHttp  $client   The HTTP client object.
+	 *
+	 * @since   12.3
+	 */
 	public function __construct(JRegistry $options = null, JMediawikiHttp $client = null)
 	{
 		$this->options = isset($options) ? $options : new JRegistry;
@@ -95,15 +95,15 @@ public function __construct(JRegistry $options = null, JMediawikiHttp $client =
 	}
 
 	/**
-     * Magic method to lazily create API objects
-     *
-     * @param   string  $name  Name of property to retrieve
-     *
-     * @return  JMediaWikiObject  MediaWiki API object (users, reviews, etc).
-     *
-     * @since   12.3
-     * @throws  InvalidArgumentException
-     */
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JMediaWikiObject  MediaWiki API object (users, reviews, etc).
+	 *
+	 * @since   12.3
+	 * @throws  InvalidArgumentException
+	 */
 	public function __get($name)
 	{
 		$name = strtolower($name);
@@ -132,29 +132,29 @@ public function __get($name)
 	}
 
 	/**
-     * Get an option from the JMediawiki instance.
-     *
-     * @param   string  $key  The name of the option to get.
-     *
-     * @return  mixed  The option value.
-     *
-     * @since   12.3
-     */
+	 * Get an option from the JMediawiki instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
 	public function getOption($key)
 	{
 		return $this->options->get($key);
 	}
 
 	/**
-     * Set an option for the JMediawiki instance.
-     *
-     * @param   string  $key    The name of the option to set.
-     * @param   mixed   $value  The option value to set.
-     *
-     * @return  JMediawiki  This object for method chaining.
-     *
-     * @since   12.3
-     */
+	 * Set an option for the JMediawiki instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JMediawiki  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
 	public function setOption($key, $value)
 	{
 		$this->options->set($key, $value);
diff --git a/libraries/joomla/mediawiki/object.php b/libraries/joomla/mediawiki/object.php
index 1450225a432ca..e0d7c61e440f6 100644
--- a/libraries/joomla/mediawiki/object.php
+++ b/libraries/joomla/mediawiki/object.php
@@ -18,7 +18,6 @@
  */
 abstract class JMediawikiObject
 {
-
 	/**
 	 * @var    JRegistry  Options for the MediaWiki object.
 	 * @since  12.3
@@ -32,13 +31,13 @@ abstract class JMediawikiObject
 	protected $client;
 
 	/**
-     * Constructor.
-     *
-     * @param   JRegistry       $options  Mediawiki options object.
-     * @param   JMediawikiHttp  $client   The HTTP client object.
-     *
-     * @since   12.3
-     */
+	 * Constructor.
+	 *
+	 * @param   JRegistry       $options  Mediawiki options object.
+	 * @param   JMediawikiHttp  $client   The HTTP client object.
+	 *
+	 * @since   12.3
+	 */
 	public function __construct(JRegistry $options = null, JMediawikiHttp $client = null)
 	{
 		$this->options = isset($options) ? $options : new JRegistry;
@@ -46,14 +45,14 @@ public function __construct(JRegistry $options = null, JMediawikiHttp $client =
 	}
 
 	/**
-     * Method to build and return a full request URL for the request.
-     *
-     * @param   string  $path  URL to inflect
-     *
-     * @return  string   The request URL.
-     *
-     * @since   12.3
-     */
+	 * Method to build and return a full request URL for the request.
+	 *
+	 * @param   string  $path  URL to inflect
+	 *
+	 * @return  string   The request URL.
+	 *
+	 * @since   12.3
+	 */
 	protected function fetchUrl($path)
 	{
 		// Append the path with output format
@@ -75,14 +74,14 @@ protected function fetchUrl($path)
 	}
 
 	/**
-     * Method to build request parameters from a string array.
-     *
-     * @param   array  $params  string array that contains the parameters
-     *
-     * @return  string   request parameter
-     *
-     * @since   12.3
-     */
+	 * Method to build request parameters from a string array.
+	 *
+	 * @param   array  $params  string array that contains the parameters
+	 *
+	 * @return  string   request parameter
+	 *
+	 * @since   12.3
+	 */
 	public function buildParameter(array $params)
 	{
 		$path = '';
@@ -101,14 +100,16 @@ public function buildParameter(array $params)
 	}
 
 	/**
-     * Method to validate response for errors
-     *
-     * @param   JHttpresponse  $response  reponse from the mediawiki server
-     *
-     * @return  Object
-     *
-     * @since   12.3
-     */
+	 * Method to validate response for errors
+	 *
+	 * @param   JHttpresponse  $response  reponse from the mediawiki server
+	 *
+	 * @return  Object
+	 *
+	 * @since   12.3
+	 *
+	 * @throws  DomainException
+	 */
 	public function validateResponse($response)
 	{
 		$xml = simplexml_load_string($response->body);
@@ -125,5 +126,4 @@ public function validateResponse($response)
 
 		return $xml;
 	}
-
 }
diff --git a/libraries/joomla/mediawiki/pages.php b/libraries/joomla/mediawiki/pages.php
index 70c0cc3a83864..5b06ed27537ea 100644
--- a/libraries/joomla/mediawiki/pages.php
+++ b/libraries/joomla/mediawiki/pages.php
@@ -19,18 +19,18 @@
 class JMediawikiPages extends JMediawikiObject
 {
 	/**
-     * Method to edit a page.
+	 * Method to edit a page.
 	 *
 	 * @param   string  $title         Page title.
 	 * @param   int     $section       Section number.
 	 * @param   string  $sectiontitle  The title for a new section.
 	 * @param   string  $text          Page content.
 	 * @param   string  $summary       Title of the page you want to delete.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function editPage($title, $section = null, $sectiontitle = null, $text = null, $summary = null)
 	{
 		// Get the token.
@@ -126,17 +126,17 @@ public function deletePageByID($pageid,  $reason = null, $watchlist = null, $old
 	}
 
 	/**
-     * Method to restore certain revisions of a deleted page.
+	 * Method to restore certain revisions of a deleted page.
 	 *
 	 * @param   string  $title      Title of the page you want to restore.
 	 * @param   string  $reason     Reason for restoring (optional).
 	 * @param   string  $timestamp  Timestamps of the revisions to restore.
 	 * @param   string  $watchlist  Unconditionally add or remove the page from your watchlist.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function undeletePage($title, $reason = null, $timestamp = null, $watchlist = null)
 	{
 		// Get the token.
@@ -161,7 +161,7 @@ public function undeletePage($title, $reason = null, $timestamp = null, $watchli
 	}
 
 	/**
-     * Method to move a page.
+	 * Method to move a page.
 	 *
 	 * @param   string   $from            Title of the page you want to move.
 	 * @param   string   $to              Title you want to rename the page to.
@@ -171,11 +171,11 @@ public function undeletePage($title, $reason = null, $timestamp = null, $watchli
 	 * @param   boolean  $noredirect      Don't create a redirect.
 	 * @param   string   $watchlist       Unconditionally add or remove the page from your watchlist.
 	 * @param   boolean  $ignorewarnings  Ignore any warnings.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function movePageByName($from, $to, $reason = null, $movetalk = null, $movesubpages = null, $noredirect = null,
 		$watchlist =null, $ignorewarnings = null)
 	{
@@ -249,18 +249,18 @@ public function movePageByID($fromid, $to, $reason = null, $movetalk = null, $mo
 	}
 
 	/**
-     * Method to undo the last edit to the page.
+	 * Method to undo the last edit to the page.
 	 *
 	 * @param   string  $title      Title of the page you want to rollback.
 	 * @param   string  $user       Name of the user whose edits are to be rolled back.
 	 * @param   string  $summary    Custom edit summary. If not set, default summary will be used.
 	 * @param   string  $markbot    Mark the reverted edits and the revert as bot edits.
 	 * @param   string  $watchlist  Unconditionally add or remove the page from your watchlist.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function rollback($title, $user, $summary = null, $markbot = null, $watchlist = null)
 	{
 		// Get the token.
@@ -286,7 +286,7 @@ public function rollback($title, $user, $summary = null, $markbot = null, $watch
 	}
 
 	/**
-     * Method to change the protection level of a page.
+	 * Method to change the protection level of a page.
 	 *
 	 * @param   string  $title        Title of the page you want to (un)protect.
 	 * @param   string  $protections  Pipe-separated list of protection levels.
@@ -294,11 +294,11 @@ public function rollback($title, $user, $summary = null, $markbot = null, $watch
 	 * @param   string  $reason       Reason for (un)protecting (optional).
 	 * @param   string  $cascade      Enable cascading protection.
 	 * @param   string  $watchlist    Unconditionally add or remove the page from your watchlist.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function changeProtection($title, $protections, $expiry = null, $reason = null, $cascade = null, $watchlist = null)
 	{
 		// Get the token.
@@ -325,17 +325,17 @@ public function changeProtection($title, $protections, $expiry = null, $reason =
 	}
 
 	/**
-     * Method to get basic page information.
-     *
-     * @param   array    $titles      Page titles to retrieve info.
-     * @param   array    $inprop      Which additional properties to get.
-     * @param   array    $intoken     Request a token to perform a data-modifying action on a page
-     * @param   boolean  $incontinue  When more results are available, use this to continue.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get basic page information.
+	 *
+	 * @param   array    $titles      Page titles to retrieve info.
+	 * @param   array    $inprop      Which additional properties to get.
+	 * @param   array    $intoken     Request a token to perform a data-modifying action on a page
+	 * @param   boolean  $incontinue  When more results are available, use this to continue.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getPageInfo(array $titles, array $inprop = null, array $intoken = null, $incontinue = null)
 	{
 		// Build the request
@@ -366,16 +366,16 @@ public function getPageInfo(array $titles, array $inprop = null, array $intoken
 	}
 
 	/**
-     * Method to get various properties defined in the page content.
-     *
-     * @param   array    $titles      Page titles to retrieve properties.
-     * @param   boolean  $ppcontinue  When more results are available, use this to continue.
-     * @param   string   $ppprop      Page prop to look on the page for.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get various properties defined in the page content.
+	 *
+	 * @param   array    $titles      Page titles to retrieve properties.
+	 * @param   boolean  $ppcontinue  When more results are available, use this to continue.
+	 * @param   string   $ppprop      Page prop to look on the page for.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getPageProperties(array $titles, $ppcontinue = null, $ppprop = null)
 	{
 		// Build the request
@@ -401,17 +401,17 @@ public function getPageProperties(array $titles, $ppcontinue = null, $ppprop = n
 	}
 
 	/**
-     * Method to get a list of revisions.
-     *
+	 * Method to get a list of revisions.
+	 *
 	 * @param   array    $titles   Page titles to retrieve revisions.
 	 * @param   array    $rvprop   Which properties to get for each revision.
 	 * @param   boolean  $rvparse  Parse revision content.
 	 * @param   int      $rvlimit  Limit how many revisions will be returned.
 	 *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getRevisions(array $titles, array $rvprop = null, $rvparse = null, $rvlimit = null)
 	{
 		// Build the request
@@ -442,19 +442,19 @@ public function getRevisions(array $titles, array $rvprop = null, $rvparse = nul
 	}
 
 	/**
-     * Method to get all page templates from the given page.
-     *
-     * @param   array    $titles       Page titles to retrieve templates.
-     * @param   array    $tlnamespace  Show templates in this namespace(s) only.
-     * @param   integer  $tllimit      How many templates to return.
-     * @param   boolean  $tlcontinue   When more results are available, use this to continue.
-     * @param   string   $tltemplates  Only list these templates.
-     * @param   string   $tldir        The direction in which to list.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get all page templates from the given page.
+	 *
+	 * @param   array    $titles       Page titles to retrieve templates.
+	 * @param   array    $tlnamespace  Show templates in this namespace(s) only.
+	 * @param   integer  $tllimit      How many templates to return.
+	 * @param   boolean  $tlcontinue   When more results are available, use this to continue.
+	 * @param   string   $tltemplates  Only list these templates.
+	 * @param   string   $tldir        The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getPageTemplates(array $titles, array $tlnamespace = null, $tllimit = null, $tlcontinue = null, $tltemplates = null, $tldir = null)
 	{
 		// Build the request.
@@ -495,20 +495,20 @@ public function getPageTemplates(array $titles, array $tlnamespace = null, $tlli
 	}
 
 	/**
-     * Method to get all pages that link to the given page.
-     *
-     * @param   string   $bltitle           Title to search.
-     * @param   integer  $blpageid          Pageid to search.
-     * @param   boolean  $blcontinue        When more results are available, use this to continue.
-     * @param   array    $blnamespace       The namespace to enumerate.
-     * @param   string   $blfilterredirect  How to filter for redirects..
-     * @param   integer  $bllimit           How many total pages to return.
-     * @param   boolean  $blredirect        If linking page is a redirect, find all pages that link to that redirect as well.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get all pages that link to the given page.
+	 *
+	 * @param   string   $bltitle           Title to search.
+	 * @param   integer  $blpageid          Pageid to search.
+	 * @param   boolean  $blcontinue        When more results are available, use this to continue.
+	 * @param   array    $blnamespace       The namespace to enumerate.
+	 * @param   string   $blfilterredirect  How to filter for redirects..
+	 * @param   integer  $bllimit           How many total pages to return.
+	 * @param   boolean  $blredirect        If linking page is a redirect, find all pages that link to that redirect as well.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getBackLinks($bltitle, $blpageid = null, $blcontinue = null, array $blnamespace = null, $blfilterredirect = null,
 		$bllimit = null, $blredirect = null)
 	{
@@ -557,18 +557,18 @@ public function getBackLinks($bltitle, $blpageid = null, $blcontinue = null, arr
 	}
 
 	/**
-     * Method to get all pages that link to the given interwiki link.
-     *
-     * @param   string   $iwbltitle     Interwiki link to search for. Must be used with iwblprefix.
-     * @param   string   $iwblprefix    Prefix for the interwiki.
-     * @param   boolean  $iwblcontinue  When more results are available, use this to continue.
-     * @param   integer  $iwbllimit     How many total pages to return.
-     * @param   array    $iwblprop      Which properties to get.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get all pages that link to the given interwiki link.
+	 *
+	 * @param   string   $iwbltitle     Interwiki link to search for. Must be used with iwblprefix.
+	 * @param   string   $iwblprefix    Prefix for the interwiki.
+	 * @param   boolean  $iwblcontinue  When more results are available, use this to continue.
+	 * @param   integer  $iwbllimit     How many total pages to return.
+	 * @param   array    $iwblprop      Which properties to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getIWBackLinks($iwbltitle, $iwblprefix = null, $iwblcontinue = null, $iwbllimit = null, array $iwblprop = null)
 	{
 		// Build the request
diff --git a/libraries/joomla/mediawiki/search.php b/libraries/joomla/mediawiki/search.php
index 63cc0c749c7f9..9bd13624cc922 100644
--- a/libraries/joomla/mediawiki/search.php
+++ b/libraries/joomla/mediawiki/search.php
@@ -18,23 +18,22 @@
  */
 class JMediawikiSearch extends JMediawikiObject
 {
-
 	/**
-     * Method to perform a full text search.
-     *
-     * @param   string   $srsearch     Search for all page titles (or content) that has this value.
-     * @param   array    $srnamespace  The namespace(s) to enumerate.
-     * @param   string   $srwhat       Search inside the text or titles.
-     * @param   array    $srinfo       What metadata to return.
-     * @param   array    $srprop       What properties to return.
-     * @param   boolean  $srredirects  Include redirect pages in the search.
-     * @param   integer  $sroffest     Use this value to continue paging.
-     * @param   integer  $srlimit      How many total pages to return.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to perform a full text search.
+	 *
+	 * @param   string   $srsearch     Search for all page titles (or content) that has this value.
+	 * @param   array    $srnamespace  The namespace(s) to enumerate.
+	 * @param   string   $srwhat       Search inside the text or titles.
+	 * @param   array    $srinfo       What metadata to return.
+	 * @param   array    $srprop       What properties to return.
+	 * @param   boolean  $srredirects  Include redirect pages in the search.
+	 * @param   integer  $sroffest     Use this value to continue paging.
+	 * @param   integer  $srlimit      How many total pages to return.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function search($srsearch, array $srnamespace = null, $srwhat = null, array $srinfo = null, array $srprop = null,
 		$srredirects = null, $sroffest = null, $srlimit = null)
 	{
@@ -88,18 +87,18 @@ public function search($srsearch, array $srnamespace = null, $srwhat = null, arr
 	}
 
 	/**
-     * Method to search the wiki using opensearch protocol.
-     *
-     * @param   string   $search     Search string.
+	 * Method to search the wiki using opensearch protocol.
+	 *
+	 * @param   string   $search     Search string.
 	 * @param   integer  $limit	     Maximum amount of results to return.
-     * @param   array    $namespace  Namespaces to search.
-     * @param   string   $suggest    Do nothing if $wgEnableOpenSearchSuggest is false.
-     * @param   string   $format     Output format.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * @param   array    $namespace  Namespaces to search.
+	 * @param   string   $suggest    Do nothing if $wgEnableOpenSearchSuggest is false.
+	 * @param   string   $format     Output format.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function openSearch($search, $limit = null, array $namespace = null, $suggest = null, $format = null)
 	{
 		// Build the request.
diff --git a/libraries/joomla/mediawiki/sites.php b/libraries/joomla/mediawiki/sites.php
index c588cb3833ceb..b32330ed7ca5b 100644
--- a/libraries/joomla/mediawiki/sites.php
+++ b/libraries/joomla/mediawiki/sites.php
@@ -19,18 +19,18 @@
 class JMediawikiSites extends JMediawikiObject
 {
 	/**
-     * Method to get site information.
-     *
-     * @param   array    $siprop            The sysinfo properties to get.
-     * @param   string   $sifilteriw        Only local or only non local entries to return.
-     * @param   boolean  $sishowalldb       List all database servers.
-     * @param   boolean  $sinumberingroup   List the number of users in usergroups.
-     * @param   array    $siinlanguagecode  Language code for localized languages.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get site information.
+	 *
+	 * @param   array    $siprop            The sysinfo properties to get.
+	 * @param   string   $sifilteriw        Only local or only non local entries to return.
+	 * @param   boolean  $sishowalldb       List all database servers.
+	 * @param   boolean  $sinumberingroup   List the number of users in usergroups.
+	 * @param   array    $siinlanguagecode  Language code for localized languages.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getSiteInfo(array $siprop = null, $sifilteriw = null, $sishowalldb = false, $sinumberingroup = false, array $siinlanguagecode = null)
 	{
 		// Build the request.
@@ -68,24 +68,24 @@ public function getSiteInfo(array $siprop = null, $sifilteriw = null, $sishowall
 	}
 
 	/**
-     * Method to get events from logs.
-     *
-     * @param   array    $leprop    List of properties to get.
-     * @param   string   $letype    Filter log actions to only this type.
-     * @param   string   $leaction  Filter log actions to only this type.
-     * @param   string   $letitle   Filter entries to those related to a page.
-     * @param   string   $leprefix  Filter entries that start with this prefix.
-     * @param   string   $letag     Filter entries with tag.
-     * @param   string   $leuser    Filter entries made by the given user.
-     * @param   string   $lestart   Starting timestamp.
-     * @param   string   $leend     Ending timestamp.
-     * @param   string   $ledir     Direction of enumeration.
-     * @param   integer  $lelimit   Event limit to return.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get events from logs.
+	 *
+	 * @param   array    $leprop    List of properties to get.
+	 * @param   string   $letype    Filter log actions to only this type.
+	 * @param   string   $leaction  Filter log actions to only this type.
+	 * @param   string   $letitle   Filter entries to those related to a page.
+	 * @param   string   $leprefix  Filter entries that start with this prefix.
+	 * @param   string   $letag     Filter entries with tag.
+	 * @param   string   $leuser    Filter entries made by the given user.
+	 * @param   string   $lestart   Starting timestamp.
+	 * @param   string   $leend     Ending timestamp.
+	 * @param   string   $ledir     Direction of enumeration.
+	 * @param   integer  $lelimit   Event limit to return.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getEvents(array $leprop = null, $letype = null, $leaction = null, $letitle = null, $leprefix = null, $letag = null,
 		$leuser = null, $lestart = null, $leend = null, $ledir = null, $lelimit = null)
 	{
@@ -154,26 +154,26 @@ public function getEvents(array $leprop = null, $letype = null, $leaction = null
 	}
 
 	/**
-     * Method to get recent changes on a site.
-     *
-     * @param   string  $rcstart        Starting timestamp.
-     * @param   string  $rcend          Ending timestamp.
-     * @param   string  $rcdir          Direction of enumeration.
-     * @param   array   $rcnamespace    Filter changes to only this namespace(s).
-     * @param   string  $rcuser         Filter changes by this user.
-     * @param   string  $rcexcludeuser  Filter changes to exclude changes by this user.
-     * @param   string  $rctag          Filter changes by this tag.
-     * @param   array   $rcprop         Filter log actions to only this type.
-     * @param   array   $rctoken        Which token to obtain for each change.
-     * @param   array   $rcshow         Filter changes by this criteria.
-     * @param   string  $rclimit        Changes limit to return.
-     * @param   string  $rctype         Filter event by type of changes.
-     * @param   string  $rctoponly      Filter changes which are latest revision.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get recent changes on a site.
+	 *
+	 * @param   string  $rcstart        Starting timestamp.
+	 * @param   string  $rcend          Ending timestamp.
+	 * @param   string  $rcdir          Direction of enumeration.
+	 * @param   array   $rcnamespace    Filter changes to only this namespace(s).
+	 * @param   string  $rcuser         Filter changes by this user.
+	 * @param   string  $rcexcludeuser  Filter changes to exclude changes by this user.
+	 * @param   string  $rctag          Filter changes by this tag.
+	 * @param   array   $rcprop         Filter log actions to only this type.
+	 * @param   array   $rctoken        Which token to obtain for each change.
+	 * @param   array   $rcshow         Filter changes by this criteria.
+	 * @param   string  $rclimit        Changes limit to return.
+	 * @param   string  $rctype         Filter event by type of changes.
+	 * @param   string  $rctoponly      Filter changes which are latest revision.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getRecentChanges($rcstart = null, $rcend = null, $rcdir = null, array $rcnamespace = null, $rcuser = null, $rcexcludeuser = null,
 		$rctag = null, array $rcprop = null, array $rctoken = null, array $rcshow = null, $rclimit = null, $rctype = null, $rctoponly = null)
 	{
@@ -252,20 +252,20 @@ public function getRecentChanges($rcstart = null, $rcend = null, $rcdir = null,
 	}
 
 	/**
-     * Method to get protected titles on a site.
-     *
-     * @param   array    $ptnamespace  Only list titles in this namespace.
-     * @param   array    $ptlevel      Only list titles with these protection level.
-     * @param   integer  $ptlimit      Limit of pages to return.
-     * @param   string   $ptdir        Direction of enumeration.
-     * @param   string   $ptstart      Starting timestamp.
-     * @param   string   $ptend        Ending timestamp.
-     * @param   array    $ptprop       List of properties to get.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get protected titles on a site.
+	 *
+	 * @param   array    $ptnamespace  Only list titles in this namespace.
+	 * @param   array    $ptlevel      Only list titles with these protection level.
+	 * @param   integer  $ptlimit      Limit of pages to return.
+	 * @param   string   $ptdir        Direction of enumeration.
+	 * @param   string   $ptstart      Starting timestamp.
+	 * @param   string   $ptend        Ending timestamp.
+	 * @param   array    $ptprop       List of properties to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getProtectedTitles(array $ptnamespace = null, array $ptlevel = null, $ptlimit = null, $ptdir = null, $ptstart = null,
 		$ptend = null, array $ptprop = null)
 	{
diff --git a/libraries/joomla/mediawiki/users.php b/libraries/joomla/mediawiki/users.php
index eb86cea8c6b92..706ef3c6442a0 100644
--- a/libraries/joomla/mediawiki/users.php
+++ b/libraries/joomla/mediawiki/users.php
@@ -19,16 +19,16 @@
 class JMediawikiUsers extends JMediawikiObject
 {
 	/**
-     * Method to login and get authentication tokens.
-     *
-     * @param   string  $lgname      User Name.
-     * @param   string  $lgpassword  Password.
-     * @param   string  $lgdomain    Domain (optional).
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to login and get authentication tokens.
+	 *
+	 * @param   string  $lgname      User Name.
+	 * @param   string  $lgpassword  Password.
+	 * @param   string  $lgdomain    Domain (optional).
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function login($lgname, $lgpassword, $lgdomain = null)
 	{
 		// Build the request path.
@@ -91,15 +91,15 @@ public function logout()
 	}
 
 	/**
-     * Method to get user information.
+	 * Method to get user information.
 	 *
 	 * @param   array  $ususers  A list of users to obtain the same information for.
 	 * @param   array  $usprop   What pieces of information to include.
 	 *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getUserInfo(array $ususers, array $usprop = null)
 	{
 		// Build the request path.
@@ -120,14 +120,14 @@ public function getUserInfo(array $ususers, array $usprop = null)
 	}
 
 	/**
-     * Method to get current user information.
+	 * Method to get current user information.
 	 *
 	 * @param   array  $uiprop  What pieces of information to include.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getCurrentUserInfo(array $uiprop = null)
 	{
 		// Build the request path.
@@ -145,25 +145,25 @@ public function getCurrentUserInfo(array $uiprop = null)
 	}
 
 	/**
-     * Method to get user contributions.
-     *
-     * @param   string   $ucuser        The users to retrieve contributions for.
+	 * Method to get user contributions.
+	 *
+	 * @param   string   $ucuser        The users to retrieve contributions for.
 	 * @param   string   $ucuserprefix  Retrieve contibutions for all users whose names begin with this value.
-     * @param   integer  $uclimit       The users to retrieve contributions for.
-     * @param   string   $ucstart       The start timestamp to return from.
-     * @param   string   $ucend         The end timestamp to return to.
-     * @param   boolean  $uccontinue    When more results are available, use this to continue.
-     * @param   string   $ucdir         In which direction to enumerate.
-     * @param   array    $ucnamespace   Only list contributions in these namespaces.
-     * @param   array    $ucprop        Include additional pieces of information.
-     * @param   array    $ucshow        Show only items that meet this criteria.
-     * @param   string   $uctag         Only list revisions tagged with this tag.
-     * @param   string   $uctoponly     Only list changes which are the latest revision
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * @param   integer  $uclimit       The users to retrieve contributions for.
+	 * @param   string   $ucstart       The start timestamp to return from.
+	 * @param   string   $ucend         The end timestamp to return to.
+	 * @param   boolean  $uccontinue    When more results are available, use this to continue.
+	 * @param   string   $ucdir         In which direction to enumerate.
+	 * @param   array    $ucnamespace   Only list contributions in these namespaces.
+	 * @param   array    $ucprop        Include additional pieces of information.
+	 * @param   array    $ucshow        Show only items that meet this criteria.
+	 * @param   string   $uctag         Only list revisions tagged with this tag.
+	 * @param   string   $uctoponly     Only list changes which are the latest revision
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getUserContribs($ucuser = null, $ucuserprefix = null, $uclimit = null, $ucstart = null, $ucend = null, $uccontinue = null,
 		$ucdir = null, array $ucnamespace = null, array $ucprop = null, array $ucshow = null, $uctag = null, $uctoponly = null)
 	{
@@ -237,7 +237,7 @@ public function getUserContribs($ucuser = null, $ucuserprefix = null, $uclimit =
 	}
 
 	/**
-     * Method to block a user.
+	 * Method to block a user.
 	 *
 	 * @param   string   $user           Username, IP address or IP range you want to block.
 	 * @param   string   $expiry         Relative expiry time, Default: never.
@@ -250,11 +250,11 @@ public function getUserContribs($ucuser = null, $ucuserprefix = null, $uclimit =
 	 * @param   boolean  $allowusertalk  Allow the user to edit their own talk page.
 	 * @param   boolean  $reblock        If the user is already blocked, overwrite the existing block.
 	 * @param   boolean  $watchuser      Watch the user/IP's user and talk pages.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function blockUser($user, $expiry = null, $reason = null, $anononly = null, $nocreate = null, $autoblock = null, $noemail = null,
 		$hidename = null, $allowusertalk = null, $reblock = null, $watchuser = null)
 	{
@@ -287,15 +287,15 @@ public function blockUser($user, $expiry = null, $reason = null, $anononly = nul
 	}
 
 	/**
-     * Method to unblock a user.
+	 * Method to unblock a user.
 	 *
 	 * @param   string  $user    Username, IP address or IP range you want to unblock.
 	 * @param   string  $reason  Reason for unblock (optional).
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function unBlockUserByName($user, $reason = null)
 	{
 		// Get the token.
@@ -350,17 +350,17 @@ public function unBlockUserByID($id, $reason = null)
 	}
 
 	/**
-     * Method to assign a user to a group.
+	 * Method to assign a user to a group.
 	 *
 	 * @param   string  $username  User name.
 	 * @param   array   $add       Add the user to these groups.
 	 * @param   array   $remove    Remove the user from these groups.
 	 * @param   string  $reason    Reason for the change.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function assignGroup($username, $add = null, $remove = null, $reason = null)
 	{
 		// Get the token.
@@ -385,17 +385,17 @@ public function assignGroup($username, $add = null, $remove = null, $reason = nu
 	}
 
 	/**
-     * Method to email a user.
+	 * Method to email a user.
 	 *
 	 * @param   string   $target   User to send email to.
 	 * @param   string   $subject  Subject header.
 	 * @param   string   $text     Mail body.
 	 * @param   boolean  $ccme     Send a copy of this mail to me.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function emailUser($target, $subject = null, $text = null, $ccme = null)
 	{
 		// Get the token.
diff --git a/libraries/joomla/oauth2/client.php b/libraries/joomla/oauth2/client.php
index cccda9270505f..8f79595c27841 100644
--- a/libraries/joomla/oauth2/client.php
+++ b/libraries/joomla/oauth2/client.php
@@ -80,7 +80,6 @@ public function authenticate()
 
 			if ($response->code >= 200 && $response->code < 400)
 			{
-
 				if ($response->headers['Content-Type'] == 'application/json')
 				{
 					$token = array_merge(json_decode($response->body, true), array('created' => time()));
@@ -105,6 +104,7 @@ public function authenticate()
 		{
 			$this->application->redirect($this->createUrl());
 		}
+
 		return false;
 	}
 
@@ -214,6 +214,7 @@ public function query($url, $data = null, $headers = array(), $method = 'get', $
 			{
 				return false;
 			}
+
 			$token = $this->refreshToken($token['refresh_token']);
 		}
 
@@ -231,6 +232,7 @@ public function query($url, $data = null, $headers = array(), $method = 'get', $
 			{
 				$url .= '?';
 			}
+
 			$url .= $this->getOption('getparam') ? $this->getOption('getparam') : 'access_token';
 			$url .= '=' . $token['access_token'];
 		}
@@ -256,6 +258,7 @@ public function query($url, $data = null, $headers = array(), $method = 'get', $
 		{
 			throw new RuntimeException('Error code ' . $response->code . ' received requesting data: ' . $response->body . '.');
 		}
+
 		return $response;
 	}
 
@@ -318,6 +321,7 @@ public function setToken($value)
 			$value['expires_in'] = $value['expires'];
 			unset($value['expires']);
 		}
+
 		$this->setOption('accesstoken', $value);
 
 		return $this;
@@ -349,8 +353,10 @@ public function refreshToken($token = null)
 			{
 				throw new RuntimeException('No refresh token is available.');
 			}
+
 			$token = $token['refresh_token'];
 		}
+
 		$data['grant_type'] = 'refresh_token';
 		$data['refresh_token'] = $token;
 		$data['client_id'] = $this->getOption('clientid');
diff --git a/libraries/joomla/object/object.php b/libraries/joomla/object/object.php
index 8ce16d69dbebf..2eccee7080ebb 100644
--- a/libraries/joomla/object/object.php
+++ b/libraries/joomla/object/object.php
@@ -73,6 +73,7 @@ public function __toString()
 	public function def($property, $default = null)
 	{
 		$value = $this->get($property, $default);
+
 		return $this->set($property, $value);
 	}
 
@@ -94,6 +95,7 @@ public function get($property, $default = null)
 		{
 			return $this->$property;
 		}
+
 		return $default;
 	}
 
@@ -111,6 +113,7 @@ public function get($property, $default = null)
 	public function getProperties($public = true)
 	{
 		$vars = get_object_vars($this);
+
 		if ($public)
 		{
 			foreach ($vars as $key => $value)
@@ -192,6 +195,7 @@ public function set($property, $value = null)
 	{
 		$previous = isset($this->$property) ? $this->$property : null;
 		$this->$property = $value;
+
 		return $previous;
 	}
 
@@ -215,6 +219,7 @@ public function setProperties($properties)
 				// Use the set function which might be overridden.
 				$this->set($k, $v);
 			}
+
 			return true;
 		}
 
diff --git a/libraries/joomla/openstreetmap/info.php b/libraries/joomla/openstreetmap/info.php
index b3ba0600202e0..b3a29edda4c95 100644
--- a/libraries/joomla/openstreetmap/info.php
+++ b/libraries/joomla/openstreetmap/info.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  * @since       13.1
-*/
+ */
 class JOpenstreetmapInfo extends JOpenstreetmapObject
 {
 	/**
diff --git a/libraries/joomla/openstreetmap/user.php b/libraries/joomla/openstreetmap/user.php
index 8798daecefbd1..7e09d1b37c92f 100644
--- a/libraries/joomla/openstreetmap/user.php
+++ b/libraries/joomla/openstreetmap/user.php
@@ -15,7 +15,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  * @since       13.1
-*/
+ */
 class JOpenstreetmapUser extends JOpenstreetmapObject
 {
 	/**
diff --git a/libraries/joomla/session/session.php b/libraries/joomla/session/session.php
index d636d40ddb17d..248a69b9f1a83 100644
--- a/libraries/joomla/session/session.php
+++ b/libraries/joomla/session/session.php
@@ -158,6 +158,7 @@ public function __get($name)
 		if ($name === 'state' || $name === 'expire')
 		{
 			$property = '_' . $name;
+
 			return $this->$property;
 		}
 	}
@@ -257,6 +258,7 @@ public function hasToken($tCheck, $forceExpire = true)
 			{
 				$this->_state = 'expired';
 			}
+
 			return false;
 		}
 
@@ -321,6 +323,7 @@ public static function checkToken($method = 'post')
 		if (!$app->input->$method->get($token, '', 'alnum'))
 		{
 			$session = JFactory::getSession();
+
 			if ($session->isNew())
 			{
 				// Redirect to login screen.
@@ -352,6 +355,7 @@ public function getName()
 			// @TODO : raise error
 			return null;
 		}
+
 		return session_name();
 	}
 
@@ -369,6 +373,7 @@ public function getId()
 			// @TODO : raise error
 			return null;
 		}
+
 		return session_id();
 	}
 
@@ -439,6 +444,7 @@ public function isActive()
 	public function isNew()
 	{
 		$counter = $this->get('session.counter');
+
 		return (bool) ($counter === 1);
 	}
 
@@ -478,6 +484,7 @@ public function get($name, $default = null, $namespace = 'default')
 		{
 			// @TODO :: generated error here
 			$error = null;
+
 			return $error;
 		}
 
@@ -485,6 +492,7 @@ public function get($name, $default = null, $namespace = 'default')
 		{
 			return $_SESSION[$namespace][$name];
 		}
+
 		return $default;
 	}
 
@@ -570,6 +578,7 @@ public function clear($name, $namespace = 'default')
 		}
 
 		$value = null;
+
 		if (isset($_SESSION[$namespace][$name]))
 		{
 			$value = $_SESSION[$namespace][$name];
@@ -698,6 +707,7 @@ public function destroy()
 		session_destroy();
 
 		$this->_state = 'destroyed';
+
 		return true;
 	}
 
@@ -712,6 +722,7 @@ public function destroy()
 	public function restart()
 	{
 		$this->destroy();
+
 		if ($this->_state !== 'destroyed')
 		{
 			// @TODO :: generated error here
@@ -799,6 +810,7 @@ public function close()
 	protected function _setCookieParams()
 	{
 		$cookie = session_get_cookie_params();
+
 		if ($this->_force_ssl)
 		{
 			$cookie['secure'] = true;
@@ -815,6 +827,7 @@ protected function _setCookieParams()
 		{
 			$cookie['path'] = $config->get('cookie_path');
 		}
+
 		session_set_cookie_params($cookie['lifetime'], $cookie['path'], $cookie['domain'], $cookie['secure'], true);
 	}
 
@@ -833,6 +846,7 @@ protected function _createToken($length = 32)
 		$max = strlen($chars) - 1;
 		$token = '';
 		$name = session_name();
+
 		for ($i = 0; $i < $length; ++$i)
 		{
 			$token .= $chars[(rand(0, $max))];
@@ -854,6 +868,7 @@ protected function _setCounter()
 		++$counter;
 
 		$this->set('session.counter', $counter);
+
 		return true;
 	}
 
@@ -966,6 +981,7 @@ protected function _validate($restart = false)
 			if ($maxTime < $curTime)
 			{
 				$this->_state = 'expired';
+
 				return false;
 			}
 		}
@@ -988,6 +1004,7 @@ protected function _validate($restart = false)
 			elseif ($_SERVER['REMOTE_ADDR'] !== $ip)
 			{
 				$this->_state = 'error';
+
 				return false;
 			}
 		}
diff --git a/libraries/joomla/session/storage/apc.php b/libraries/joomla/session/storage/apc.php
index 5ac829747a663..7725d6e1a415d 100644
--- a/libraries/joomla/session/storage/apc.php
+++ b/libraries/joomla/session/storage/apc.php
@@ -50,6 +50,7 @@ public function __construct($options = array())
 	public function read($id)
 	{
 		$sess_id = 'sess_' . $id;
+
 		return (string) apc_fetch($sess_id);
 	}
 
@@ -66,6 +67,7 @@ public function read($id)
 	public function write($id, $session_data)
 	{
 		$sess_id = 'sess_' . $id;
+
 		return apc_store($sess_id, $session_data, ini_get("session.gc_maxlifetime"));
 	}
 
@@ -81,6 +83,7 @@ public function write($id, $session_data)
 	public function destroy($id)
 	{
 		$sess_id = 'sess_' . $id;
+
 		return apc_delete($sess_id);
 	}
 
diff --git a/libraries/joomla/session/storage/database.php b/libraries/joomla/session/storage/database.php
index 073a5d49bc919..8283695490018 100644
--- a/libraries/joomla/session/storage/database.php
+++ b/libraries/joomla/session/storage/database.php
@@ -82,6 +82,7 @@ public function write($id, $data)
 
 			// Try to update the session data in the database table.
 			$db->setQuery($query);
+
 			if (!$db->execute())
 			{
 				return false;
diff --git a/libraries/joomla/session/storage/xcache.php b/libraries/joomla/session/storage/xcache.php
index b6447b601dc60..61204bf09aabc 100644
--- a/libraries/joomla/session/storage/xcache.php
+++ b/libraries/joomla/session/storage/xcache.php
@@ -71,6 +71,7 @@ public function read($id)
 	public function write($id, $session_data)
 	{
 		$sess_id = 'sess_' . $id;
+
 		return xcache_set($sess_id, $session_data, ini_get("session.gc_maxlifetime"));
 	}
 
diff --git a/libraries/joomla/string/punycode.php b/libraries/joomla/string/punycode.php
index 126491c629bd6..b120a6e2f0cc5 100644
--- a/libraries/joomla/string/punycode.php
+++ b/libraries/joomla/string/punycode.php
@@ -54,7 +54,6 @@ public static function fromPunycode($punycodeString)
 		$idn = new idna_convert;
 
 		return $idn->decode($punycodeString);
-
 	}
 
 	/**
@@ -115,6 +114,11 @@ public static function urlToPunycode($uri)
 			$newuri .= '?' . $parsed['query'];
 		}
 
+		if (!empty($parsed['fragment']))
+		{
+			$newuri .= '#' . $parsed['fragment'];
+		}
+
 		return $newuri;
 	}
 
@@ -181,6 +185,11 @@ public static function urlToUTF8($uri)
 			$newuri .= '?' . $parsed['query'];
 		}
 
+		if (!empty($parsed['fragment']))
+		{
+			$newuri .= '#' . $parsed['fragment'];
+		}
+
 		return $newuri;
 	}
 
diff --git a/libraries/joomla/string/string.php b/libraries/joomla/string/string.php
index 620f501b7d933..f280290a76e7b 100644
--- a/libraries/joomla/string/string.php
+++ b/libraries/joomla/string/string.php
@@ -157,9 +157,9 @@ public static function increment($string, $style = 'default', $n = 0)
 	 *
 	 * Find position of first occurrence of a string.
 	 *
-	 * @param   string   $str     String being examined
-	 * @param   string   $search  String being searched for
-	 * @param   integer  $offset  Optional, specifies the position from which the search should be performed
+	 * @param   string  $str     String being examined
+	 * @param   string  $search  String being searched for
+	 * @param   mixed   $offset  Optional, specifies the position from which the search should be performed
 	 *
 	 * @return  mixed  Number of characters before the first match or FALSE on failure
 	 *
@@ -202,7 +202,7 @@ public static function strrpos($str, $search, $offset = 0)
 	 *
 	 * @param   string   $str     String being processed
 	 * @param   integer  $offset  Number of UTF-8 characters offset (from left)
-	 * @param   integer  $length  Optional length in UTF-8 characters from offset
+	 * @param   mixed    $length  Optional length in UTF-8 characters from offset
 	 *
 	 * @return  mixed string or FALSE if failure
 	 *
@@ -582,7 +582,7 @@ public static function substr_replace($str, $repl, $start, $length = null)
 	 * work normally on a UTF-8 string
 	 *
 	 * @param   string  $str       The string to be trimmed
-	 * @param   string  $charlist  The optional charlist of additional characters to trim
+	 * @param   mixed   $charlist  The optional charlist of additional characters to trim
 	 *
 	 * @return  string  The trimmed string
 	 *
@@ -616,7 +616,7 @@ public static function ltrim($str, $charlist = false)
 	 * work normally on a UTF-8 string
 	 *
 	 * @param   string  $str       The string to be trimmed
-	 * @param   string  $charlist  The optional charlist of additional characters to trim
+	 * @param   mixed   $charlist  The optional charlist of additional characters to trim
 	 *
 	 * @return  string  The trimmed string
 	 *
@@ -650,7 +650,7 @@ public static function rtrim($str, $charlist = false)
 	 * work normally on a UTF-8 string
 	 *
 	 * @param   string  $str       The string to be trimmed
-	 * @param   string  $charlist  The optional charlist of additional characters to trim
+	 * @param   mixed   $charlist  The optional charlist of additional characters to trim
 	 *
 	 * @return  string  The trimmed string
 	 *
@@ -705,6 +705,7 @@ public static function ucfirst($str, $delimiter = null, $newDelimiter = null)
 			{
 				$newDelimiter = $delimiter;
 			}
+
 			return implode($newDelimiter, array_map('utf8_ucfirst', explode($delimiter, $str)));
 		}
 	}
@@ -844,7 +845,6 @@ public static function valid($str)
 					$mUcs4 = ($mUcs4 & 1) << 30;
 					$mState = 5;
 					$mBytes = 6;
-
 				}
 				else
 				{
diff --git a/libraries/joomla/table/extension.php b/libraries/joomla/table/extension.php
index 2cd6ae8032e8f..b789c104ea181 100644
--- a/libraries/joomla/table/extension.php
+++ b/libraries/joomla/table/extension.php
@@ -48,6 +48,7 @@ public function check()
 
 			return false;
 		}
+
 		return true;
 	}
 
diff --git a/libraries/joomla/table/nested.php b/libraries/joomla/table/nested.php
index 6d178fd248b64..d6d209549c07a 100644
--- a/libraries/joomla/table/nested.php
+++ b/libraries/joomla/table/nested.php
@@ -559,6 +559,7 @@ public function delete($pk = null, $children = true)
 
 					return false;
 				}
+
 				$asset->_unlock();
 			}
 			else
@@ -1322,6 +1323,7 @@ public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = '')
 			{
 				$query->order('parent_id, lft');
 			}
+
 			$this->_cache['rebuild.sql'] = (string) $query;
 		}
 
@@ -1679,8 +1681,10 @@ protected function _logtable($showData = true, $showQuery = true)
 			{
 				$buffer .= sprintf("\n| %4s | %4s | %4s | %4s |", $row[0], $row[1], $row[2], $row[3]);
 			}
+
 			$buffer .= $sep;
 		}
+
 		echo $buffer;
 	}
 
diff --git a/libraries/joomla/table/observer/tags.php b/libraries/joomla/table/observer/tags.php
index 8f3f14f402b79..7e4a642a9504f 100644
--- a/libraries/joomla/table/observer/tags.php
+++ b/libraries/joomla/table/observer/tags.php
@@ -103,6 +103,7 @@ public static function createObserver(JObservableInterface $observableObject, $p
 	public function onBeforeStore($updateNulls, $tableKey)
 	{
 		$this->parseTypeAlias();
+
 		if (empty($this->table->tagsHelper->tags))
 		{
 			$this->tagsHelper->preStoreProcess($this->table);
diff --git a/libraries/joomla/table/table.php b/libraries/joomla/table/table.php
index 6f943bae96e82..85fe20f78fb87 100644
--- a/libraries/joomla/table/table.php
+++ b/libraries/joomla/table/table.php
@@ -110,7 +110,7 @@ abstract class JTable extends JObject implements JObservableInterface, JTableInt
 	 * @var    array
 	 * @since  3.3
 	 */
-	protected $jsonEncode = array();
+	protected $_jsonEncode = array();
 
 	/**
 	 * Object constructor to set table and key fields.  In most cases this will
@@ -593,9 +593,9 @@ public function reset()
 	public function bind($src, $ignore = array())
 	{
 		// JSON encode any fields required
-		if (!empty($this->jsonEncode))
+		if (!empty($this->_jsonEncode))
 		{
-			foreach ($this->jsonEncode as $field)
+			foreach ($this->_jsonEncode as $field)
 			{
 				if (isset($src[$field]) && is_array($src[$field]))
 				{
@@ -688,6 +688,7 @@ public function load($keys = null, $reset = true)
 				{
 					throw new InvalidArgumentException('Table has multiple primary keys specified, only one primary key value provided.');
 				}
+
 				$keys = array($this->getKeyName() => $keys);
 			}
 			else
@@ -969,6 +970,7 @@ public function delete($pk = null)
 			{
 				throw new UnexpectedValueException('Null primary key not allowed.');
 			}
+
 			$this->$key = $pk[$key];
 		}
 
diff --git a/libraries/joomla/table/update.php b/libraries/joomla/table/update.php
index 6e931e34cde89..0c7931a5c7c91 100644
--- a/libraries/joomla/table/update.php
+++ b/libraries/joomla/table/update.php
@@ -48,6 +48,7 @@ public function check()
 
 			return false;
 		}
+
 		return true;
 	}
 
diff --git a/libraries/joomla/table/user.php b/libraries/joomla/table/user.php
index e09520efb4b68..8406eb843c6ba 100644
--- a/libraries/joomla/table/user.php
+++ b/libraries/joomla/table/user.php
@@ -150,7 +150,6 @@ public function bind($array, $ignore = '')
 
 			// Set the titles for the user groups.
 			$this->groups = $this->_db->loadAssocList('id', 'id');
-
 		}
 
 		return $return;
@@ -171,15 +170,17 @@ public function check()
 			$this->id = null;
 		}
 
+		$filterInput = JFilterInput::getInstance();
+
 		// Validate user information
-		if (trim($this->name) == '')
+		if ($filterInput->clean($this->name, 'TRIM') == '')
 		{
 			$this->setError(JText::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_YOUR_NAME'));
 
 			return false;
 		}
 
-		if (trim($this->username) == '')
+		if ($filterInput->clean($this->username, 'TRIM') == '')
 		{
 			$this->setError(JText::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_A_USER_NAME'));
 
@@ -187,14 +188,14 @@ public function check()
 		}
 
 		if (preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $this->username) || strlen(utf8_decode($this->username)) < 2
-			|| trim($this->username) != $this->username)
+			|| $filterInput->clean($this->username, 'TRIM') !== $this->username)
 		{
 			$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_VALID_AZ09', 2));
 
 			return false;
 		}
 
-		if ((trim($this->email) == "") || !JMailHelper::isEmailAddress($this->email))
+		if (($filterInput->clean($this->email, 'TRIM') == "") || !JMailHelper::isEmailAddress($this->email))
 		{
 			$this->setError(JText::_('JLIB_DATABASE_ERROR_VALID_MAIL'));
 
diff --git a/libraries/joomla/twitter/friends.php b/libraries/joomla/twitter/friends.php
index 33847cebd274c..84575e323ad1f 100644
--- a/libraries/joomla/twitter/friends.php
+++ b/libraries/joomla/twitter/friends.php
@@ -363,10 +363,12 @@ public function getFriendshipsLookup($screen_name = null, $id = null)
 		{
 			$data['user_id'] = $id;
 		}
+
 		if ($screen_name)
 		{
 			$data['screen_name'] = $screen_name;
 		}
+
 		if ($id == null && $screen_name == null)
 		{
 			// We don't have a valid entry
diff --git a/libraries/joomla/twitter/lists.php b/libraries/joomla/twitter/lists.php
index 021af90e2b713..33d158eb0dcff 100644
--- a/libraries/joomla/twitter/lists.php
+++ b/libraries/joomla/twitter/lists.php
@@ -151,7 +151,6 @@ public function getStatuses($list, $owner = null, $since_id = 0, $max_id = 0, $c
 
 		// Send the request.
 		return $this->sendRequest($path, 'GET', $data);
-
 	}
 
 	/**
@@ -227,7 +226,6 @@ public function getSubscribers($list, $owner = null, $cursor = null, $entities =
 
 		// Send the request.
 		return $this->sendRequest($path, 'GET', $data);
-
 	}
 
 	/**
@@ -279,10 +277,12 @@ public function deleteMembers($list, $user_id = null, $screen_name = null, $owne
 		{
 			$data['user_id'] = $user_id;
 		}
+
 		if ($screen_name)
 		{
 			$data['screen_name'] = $screen_name;
 		}
+
 		if ($user_id == null && $screen_name == null)
 		{
 			// We don't have a valid entry
@@ -620,10 +620,12 @@ public function addMembers($list, $user_id = null, $screen_name = null, $owner =
 		{
 			$data['user_id'] = $user_id;
 		}
+
 		if ($screen_name)
 		{
 			$data['screen_name'] = $screen_name;
 		}
+
 		if ($user_id == null && $screen_name == null)
 		{
 			// We don't have a valid entry
@@ -703,7 +705,6 @@ public function getMembers($list, $owner = null, $entities = null, $skip_status
 
 		// Send the request.
 		return $this->sendRequest($path, 'GET', $data);
-
 	}
 
 	/**
diff --git a/libraries/joomla/twitter/oauth.php b/libraries/joomla/twitter/oauth.php
index 9267f2055ff20..bb856a81a4e1b 100644
--- a/libraries/joomla/twitter/oauth.php
+++ b/libraries/joomla/twitter/oauth.php
@@ -20,9 +20,9 @@
 class JTwitterOAuth extends JOAuth1Client
 {
 	/**
-	* @var JRegistry Options for the JTwitterOauth object.
-	* @since 12.3
-	*/
+	 * @var JRegistry Options for the JTwitterOauth object.
+	 * @since 12.3
+	 */
 	protected $options;
 
 	/**
diff --git a/libraries/joomla/twitter/users.php b/libraries/joomla/twitter/users.php
index 5d1d3a64ade45..5f077e4b06182 100644
--- a/libraries/joomla/twitter/users.php
+++ b/libraries/joomla/twitter/users.php
@@ -41,10 +41,12 @@ public function getUsersLookup($screen_name = null, $id = null, $entities = null
 		{
 			$data['user_id'] = $id;
 		}
+
 		if ($screen_name)
 		{
 			$data['screen_name'] = $screen_name;
 		}
+
 		if ($id == null && $screen_name == null)
 		{
 			// We don't have a valid entry
diff --git a/libraries/joomla/updater/adapters/collection.php b/libraries/joomla/updater/adapters/collection.php
index e3f1518d62193..1d56ab99d5133 100644
--- a/libraries/joomla/updater/adapters/collection.php
+++ b/libraries/joomla/updater/adapters/collection.php
@@ -118,19 +118,23 @@ public function _startElement($parser, $name, $attrs = array())
 			case 'EXTENSION':
 				$update = JTable::getInstance('update');
 				$update->set('update_site_id', $this->updateSiteId);
+
 				foreach ($this->updatecols as $col)
 				{
 					// Reset the values if it doesn't exist
 					if (!array_key_exists($col, $attrs))
 					{
 						$attrs[$col] = '';
+
 						if ($col == 'CLIENT')
 						{
 							$attrs[$col] = 'site';
 						}
 					}
 				}
+
 				$client = JApplicationHelper::getClientInfo($attrs['CLIENT'], 1);
+
 				if (isset($client->id))
 				{
 					$attrs['CLIENT_ID'] = $client->id;
@@ -190,6 +194,7 @@ public function _startElement($parser, $name, $attrs = array())
 	protected function _endElement($parser, $name)
 	{
 		array_pop($this->stack);
+
 		switch ($name)
 		{
 			case 'CATEGORY':
@@ -231,6 +236,7 @@ public function findUpdate($options)
 			{
 				$url .= '/';
 			}
+
 			$url .= 'update.xml';
 		}
 
@@ -257,6 +263,7 @@ public function findUpdate($options)
 			if (!$appendExtension && (substr($url, -4) != '.xml'))
 			{
 				$options['append_extension'] = true;
+
 				return $this->findUpdate($options);
 			}
 
@@ -284,6 +291,7 @@ public function findUpdate($options)
 			if (!$appendExtension && (substr($url, -4) != '.xml'))
 			{
 				$options['append_extension'] = true;
+
 				return $this->findUpdate($options);
 			}
 
diff --git a/libraries/joomla/updater/adapters/extension.php b/libraries/joomla/updater/adapters/extension.php
index 74b10a87fc2ec..b57ad61ac1a31 100644
--- a/libraries/joomla/updater/adapters/extension.php
+++ b/libraries/joomla/updater/adapters/extension.php
@@ -61,10 +61,12 @@ protected function _startElement($parser, $name, $attrs = array())
 					$name = strtolower($name);
 					$this->currentUpdate->$name = '';
 				}
+
 				if ($name == 'TARGETPLATFORM')
 				{
 					$this->currentUpdate->targetplatform = $attrs;
 				}
+
 				if ($name == 'PHP_MINIMUM')
 				{
 					$this->currentUpdate->php_minimum = '';
@@ -164,11 +166,7 @@ protected function _endElement($parser, $name)
 	protected function _characterData($parser, $data)
 	{
 		$tag = $this->_getLastTag();
-		/**
-		 * @todo remove code
-		 * if(!isset($this->$tag->_data)) $this->$tag->_data = '';
-		 * $this->$tag->_data .= $data;
-		 */
+
 		if (in_array($tag, $this->updatecols))
 		{
 			$tag = strtolower($tag);
@@ -209,6 +207,7 @@ public function findUpdate($options)
 			{
 				$url .= '/';
 			}
+
 			$url .= 'extension.xml';
 		}
 
@@ -232,6 +231,7 @@ public function findUpdate($options)
 			if (!$appendExtension && (substr($url, -4) != '.xml'))
 			{
 				$options['append_extension'] = true;
+
 				return $this->findUpdate($options);
 			}
 
@@ -260,6 +260,7 @@ public function findUpdate($options)
 			if (!$appendExtension && (substr($url, -4) != '.xml'))
 			{
 				$options['append_extension'] = true;
+
 				return $this->findUpdate($options);
 			}
 
diff --git a/libraries/joomla/updater/update.php b/libraries/joomla/updater/update.php
index 0b42a16d97de7..2164fda778c57 100644
--- a/libraries/joomla/updater/update.php
+++ b/libraries/joomla/updater/update.php
@@ -252,6 +252,7 @@ public function _startElement($parser, $name, $attrs = array())
 				{
 					$this->currentUpdate->$name = new stdClass;
 				}
+
 				$this->currentUpdate->$name->_data = '';
 
 				foreach ($attrs as $key => $data)
@@ -277,6 +278,7 @@ public function _startElement($parser, $name, $attrs = array())
 	public function _endElement($parser, $name)
 	{
 		array_pop($this->stack);
+
 		switch ($name)
 		{
 			// Closing update, find the latest version and check
@@ -325,6 +327,7 @@ public function _endElement($parser, $name)
 					{
 						$this->$key = $val;
 					}
+
 					unset($this->latest);
 					unset($this->currentUpdate);
 				}
@@ -357,6 +360,7 @@ public function _characterData($parser, $data)
 
 		// Throw the data for this item together
 		$tag = strtolower($tag);
+
 		if (isset($this->currentUpdate->$tag))
 		{
 			$this->currentUpdate->$tag->_data .= $data;
diff --git a/libraries/joomla/updater/updater.php b/libraries/joomla/updater/updater.php
index f585d8a62af1f..1950c79e291fd 100644
--- a/libraries/joomla/updater/updater.php
+++ b/libraries/joomla/updater/updater.php
@@ -55,6 +55,7 @@ public static function getInstance()
 		{
 			self::$instance = new JUpdater;
 		}
+
 		return self::$instance;
 	}
 
@@ -97,15 +98,18 @@ public function findUpdates($eid = 0, $cacheTimeout = 0)
 		$results = $db->loadAssocList();
 		$result_count = count($results);
 		$now = time();
+
 		for ($i = 0; $i < $result_count; $i++)
 		{
 			$result = &$results[$i];
 			$this->setAdapter($result['type']);
+
 			if (!isset($this->_adapters[$result['type']]))
 			{
 				// Ignore update sites requiring adapters we don't have installed
 				continue;
 			}
+
 			if ($cacheTimeout > 0)
 			{
 				if (isset($result['last_check_timestamp']) && ($now - $result['last_check_timestamp'] <= $cacheTimeout))
@@ -116,7 +120,9 @@ public function findUpdates($eid = 0, $cacheTimeout = 0)
 					continue;
 				}
 			}
+
 			$update_result = $this->_adapters[$result['type']]->findUpdate($result);
+
 			if (is_array($update_result))
 			{
 				if (array_key_exists('update_sites', $update_result) && count($update_result['update_sites']))
@@ -159,6 +165,7 @@ public function findUpdates($eid = 0, $cacheTimeout = 0)
 								// We have an installed extension, check the update is actually newer
 								$extension->load($eid);
 								$data = json_decode($extension->manifest_cache, true);
+
 								if (version_compare($current_update->version, $data['version'], '>') == 1)
 								{
 									$current_update->extension_id = $eid;
@@ -193,6 +200,7 @@ public function findUpdates($eid = 0, $cacheTimeout = 0)
 			$db->setQuery($query);
 			$db->execute();
 		}
+
 		return $retval;
 	}
 
@@ -210,11 +218,12 @@ public function update($id)
 		$updaterow = JTable::getInstance('update');
 		$updaterow->load($id);
 		$update = new JUpdate;
+
 		if ($update->loadFromXML($updaterow->detailsurl))
 		{
 			return $update->install();
 		}
+
 		return false;
 	}
-
 }
diff --git a/libraries/joomla/user/authentication.php b/libraries/joomla/user/authentication.php
index 9ac3000f4fd23..1b05e07318744 100644
--- a/libraries/joomla/user/authentication.php
+++ b/libraries/joomla/user/authentication.php
@@ -292,6 +292,7 @@ public function authenticate($credentials, $options = array())
 				{
 					$response->type = isset($plugin->_name) ? $plugin->_name : $plugin->name;
 				}
+
 				break;
 			}
 		}
diff --git a/libraries/joomla/user/helper.php b/libraries/joomla/user/helper.php
index 4b3a1b0bd5471..c6baa346e26b3 100644
--- a/libraries/joomla/user/helper.php
+++ b/libraries/joomla/user/helper.php
@@ -450,6 +450,7 @@ public static function getCryptedPassword($plaintext, $salt = '', $encryption =
 				{
 					$context .= substr($binary, 0, ($i > 16 ? 16 : $i));
 				}
+
 				for ($i = $length; $i > 0; $i >>= 1)
 				{
 					$context .= ($i & 1) ? chr(0) : $plaintext[0];
@@ -465,10 +466,12 @@ public static function getCryptedPassword($plaintext, $salt = '', $encryption =
 					{
 						$new .= $salt;
 					}
+
 					if ($i % 7)
 					{
 						$new .= $plaintext;
 					}
+
 					$new .= ($i & 1) ? substr($binary, 0, 16) : $plaintext;
 					$binary = static::_bin(md5($new));
 				}
@@ -484,6 +487,7 @@ public static function getCryptedPassword($plaintext, $salt = '', $encryption =
 					{
 						$j = 5;
 					}
+
 					$p[] = static::_toAPRMD5((ord($binary[$i]) << 16) | (ord($binary[$k]) << 8) | (ord($binary[$j])), 5);
 				}
 
@@ -683,6 +687,7 @@ protected static function _toAPRMD5($value, $count)
 			$aprmd5 .= $APRMD5[$value & 0x3f];
 			$value >>= 6;
 		}
+
 		return $aprmd5;
 	}
 
@@ -705,6 +710,7 @@ private static function _bin($hex)
 			$tmp = sscanf(substr($hex, $i, 2), '%x');
 			$bin .= chr(array_shift($tmp));
 		}
+
 		return $bin;
 	}
 
diff --git a/libraries/joomla/user/user.php b/libraries/joomla/user/user.php
index bea0e420865be..95bebe4658f58 100644
--- a/libraries/joomla/user/user.php
+++ b/libraries/joomla/user/user.php
@@ -570,6 +570,7 @@ public function bind(&$array)
 
 				return false;
 			}
+
 			$this->password_clear = JArrayHelper::getValue($array, 'password', '', 'string');
 
 			$array['password'] = JUserHelper::hashPassword($array['password']);
diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index 8c4b185c40b13..235bba51b5803 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -117,6 +117,7 @@ public static function toObject(&$array, $class = 'stdClass')
 				}
 			}
 		}
+
 		return $obj;
 	}
 
@@ -227,6 +228,7 @@ protected static function _fromObject($item, $recurse, $regex)
 		{
 			$result = $item;
 		}
+
 		return $result;
 	}
 
@@ -259,6 +261,7 @@ public static function getColumn(&$array, $index)
 				// Else ignore the entry
 			}
 		}
+
 		return $result;
 	}
 
@@ -331,6 +334,7 @@ public static function getValue(&$array, $name, $default = null, $type = '')
 				// No casting necessary
 				break;
 		}
+
 		return $result;
 	}
 
@@ -381,6 +385,7 @@ public static function invert($array)
 				}
 			}
 		}
+
 		return $return;
 	}
 
@@ -569,7 +574,6 @@ protected static function _sortObjects(&$a, &$b)
 
 			if ($cmp > 0)
 			{
-
 				return $direction;
 			}
 
diff --git a/libraries/joomla/view/html.php b/libraries/joomla/view/html.php
index 29441b9a036f7..20b8c7f43b74d 100644
--- a/libraries/joomla/view/html.php
+++ b/libraries/joomla/view/html.php
@@ -107,7 +107,7 @@ public function getPath($layout)
 		$file = JPath::clean($layout . '.php');
 
 		// Find the layout file path.
-		$path = JPath::find(clone($this->paths), $file);
+		$path = JPath::find(clone $this->paths, $file);
 
 		return $path;
 	}
diff --git a/libraries/legacy/base/node.php b/libraries/legacy/base/node.php
index 3bacfad6a321a..3ad307dbd03ce 100644
--- a/libraries/legacy/base/node.php
+++ b/libraries/legacy/base/node.php
@@ -87,14 +87,17 @@ public function setParent(&$parent)
 		if ($parent instanceof JNode || is_null($parent))
 		{
 			$hash = spl_object_hash($this);
+
 			if (!is_null($this->_parent))
 			{
 				unset($this->_parent->children[$hash]);
 			}
+
 			if (!is_null($parent))
 			{
 				$parent->_children[$hash] = & $this;
 			}
+
 			$this->_parent = & $parent;
 		}
 	}
diff --git a/libraries/legacy/base/tree.php b/libraries/legacy/base/tree.php
index 1f5322f352191..09b5aceef6ce9 100644
--- a/libraries/legacy/base/tree.php
+++ b/libraries/legacy/base/tree.php
@@ -64,6 +64,7 @@ public function addChild(&$node, $setCurrent = false)
 		JLog::add('JTree::addChild() is deprecated.', JLog::WARNING, 'deprecated');
 
 		$this->_current->addChild($node);
+
 		if ($setCurrent)
 		{
 			$this->_current = &$node;
diff --git a/libraries/legacy/categories/categories.php b/libraries/legacy/categories/categories.php
index e41c82ffaa693..fe15a4ddf88e9 100644
--- a/libraries/legacy/categories/categories.php
+++ b/libraries/legacy/categories/categories.php
@@ -138,6 +138,7 @@ public static function getInstance($extension, $options = array())
 		if (!class_exists($classname))
 		{
 			$path = JPATH_SITE . '/components/' . $component . '/helpers/category.php';
+
 			if (is_file($path))
 			{
 				include_once $path;
@@ -664,6 +665,7 @@ public function __construct($category = null, $constructor = null)
 		if ($category)
 		{
 			$this->setProperties($category);
+
 			if ($constructor)
 			{
 				$this->_constructor = $constructor;
@@ -709,6 +711,7 @@ public function setParent($parent)
 				{
 					$this->_path = $parent->getPath();
 				}
+
 				$this->_path[] = $this->id . ':' . $this->alias;
 			}
 
@@ -769,6 +772,7 @@ public function &getChildren($recursive = false)
 		if (!$this->_allChildrenloaded)
 		{
 			$temp = $this->_constructor->get($this->id, true);
+
 			if ($temp)
 			{
 				$this->_children = $temp->getChildren();
@@ -781,11 +785,13 @@ public function &getChildren($recursive = false)
 		if ($recursive)
 		{
 			$items = array();
+
 			foreach ($this->_children as $child)
 			{
 				$items[] = $child;
 				$items = array_merge($items, $child->getChildren(true));
 			}
+
 			return $items;
 		}
 
@@ -960,6 +966,7 @@ public function getAuthor($modified_user = false)
 	public function setAllLoaded()
 	{
 		$this->_allChildrenloaded = true;
+
 		foreach ($this->_children as $child)
 		{
 			$child->setAllLoaded();
diff --git a/libraries/legacy/controller/admin.php b/libraries/legacy/controller/admin.php
index ce2f592164bda..24a2dceef64f2 100644
--- a/libraries/legacy/controller/admin.php
+++ b/libraries/legacy/controller/admin.php
@@ -90,10 +90,12 @@ public function __construct($config = array())
 		if (empty($this->view_list))
 		{
 			$r = null;
+
 			if (!preg_match('/(.*)Controller(.*)/i', get_class($this), $r))
 			{
 				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
 			}
+
 			$this->view_list = strtolower($r[2]);
 		}
 	}
@@ -223,14 +225,15 @@ public function publish()
 				{
 					$ntext = $this->text_prefix . '_N_ITEMS_TRASHED';
 				}
+
 				$this->setMessage(JText::plural($ntext, count($cid)));
 			}
 			catch (Exception $e)
 			{
 				$this->setMessage($e->getMessage(), 'error');
 			}
-
 		}
+
 		$extension = $this->input->get('extension');
 		$extensionURL = ($extension) ? '&extension=' . $extension : '';
 		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $extensionURL, false));
@@ -253,11 +256,13 @@ public function reorder()
 
 		$model = $this->getModel();
 		$return = $model->reorder($ids, $inc);
+
 		if ($return === false)
 		{
 			// Reorder failed.
 			$message = JText::sprintf('JLIB_APPLICATION_ERROR_REORDER_FAILED', $model->getError());
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message, 'error');
+
 			return false;
 		}
 		else
@@ -265,6 +270,7 @@ public function reorder()
 			// Reorder succeeded.
 			$message = JText::_('JLIB_APPLICATION_SUCCESS_ITEM_REORDERED');
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message);
+
 			return true;
 		}
 	}
@@ -300,6 +306,7 @@ public function saveorder()
 			// Reorder failed
 			$message = JText::sprintf('JLIB_APPLICATION_ERROR_REORDER_FAILED', $model->getError());
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message, 'error');
+
 			return false;
 		}
 		else
@@ -307,6 +314,7 @@ public function saveorder()
 			// Reorder succeeded.
 			$this->setMessage(JText::_('JLIB_APPLICATION_SUCCESS_ORDERING_SAVED'));
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+
 			return true;
 		}
 	}
@@ -327,11 +335,13 @@ public function checkin()
 
 		$model = $this->getModel();
 		$return = $model->checkin($ids);
+
 		if ($return === false)
 		{
 			// Checkin failed.
 			$message = JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError());
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message, 'error');
+
 			return false;
 		}
 		else
@@ -339,6 +349,7 @@ public function checkin()
 			// Checkin succeeded.
 			$message = JText::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', count($ids));
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message);
+
 			return true;
 		}
 	}
diff --git a/libraries/legacy/controller/form.php b/libraries/legacy/controller/form.php
index b2fb590d76825..897244b87e430 100644
--- a/libraries/legacy/controller/form.php
+++ b/libraries/legacy/controller/form.php
@@ -88,10 +88,12 @@ public function __construct($config = array())
 		if (empty($this->context))
 		{
 			$r = null;
+
 			if (!preg_match('/(.*)Controller(.*)/i', get_class($this), $r))
 			{
 				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
 			}
+
 			$this->context = strtolower($r[2]);
 		}
 
@@ -191,11 +193,12 @@ public function add()
 	protected function allowAdd($data = array())
 	{
 		$user = JFactory::getUser();
+
 		return ($user->authorise('core.create', $this->option) || count($user->getAuthorisedCategories($this->option, 'core.create')));
 	}
 
 	/**
-	 * Method to check if you can add a new record.
+	 * Method to check if you can edit an existing record.
 	 *
 	 * Extended classes can override this if necessary.
 	 *
@@ -253,6 +256,7 @@ public function batch($model)
 
 		// Build an array of item contexts to check
 		$contexts = array();
+
 		foreach ($cid as $id)
 		{
 			// If we're coming from com_categories, we need to use extension vs. option
@@ -264,6 +268,7 @@ public function batch($model)
 			{
 				$option = $this->option;
 			}
+
 			$contexts[$id] = $option . '.' . $this->context . '.' . $id;
 		}
 
diff --git a/libraries/legacy/controller/legacy.php b/libraries/legacy/controller/legacy.php
index b7f2ab02cf2b2..fe660e7732e83 100644
--- a/libraries/legacy/controller/legacy.php
+++ b/libraries/legacy/controller/legacy.php
@@ -439,7 +439,6 @@ public function __construct($config = array())
 		{
 			$this->default_view = $this->getName();
 		}
-
 	}
 
 	/**
@@ -711,6 +710,7 @@ public function execute($task)
 		$this->task = $task;
 
 		$task = strtolower($task);
+
 		if (isset($this->taskMap[$task]))
 		{
 			$doTask = $this->taskMap[$task];
@@ -773,6 +773,7 @@ public function getModel($name = '', $prefix = '', $config = array())
 				}
 			}
 		}
+
 		return $model;
 	}
 
@@ -792,10 +793,12 @@ public function getName()
 		if (empty($this->name))
 		{
 			$r = null;
+
 			if (!preg_match('/(.*)Controller/i', get_class($this), $r))
 			{
 				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
 			}
+
 			$this->name = strtolower($r[1]);
 		}
 
@@ -1093,6 +1096,7 @@ protected function setPath($type, $path)
 	public function setRedirect($url, $msg = null, $type = null)
 	{
 		$this->redirect = $url;
+
 		if ($msg !== null)
 		{
 			// Controller may have set this directly
diff --git a/libraries/legacy/error/error.php b/libraries/legacy/error/error.php
index f60b3023d539b..472a276c89317 100644
--- a/libraries/legacy/error/error.php
+++ b/libraries/legacy/error/error.php
@@ -116,6 +116,7 @@ public static function getError($unset = false)
 		{
 			$error = &self::$stack[0];
 		}
+
 		return $error;
 	}
 
@@ -176,6 +177,7 @@ public static function raise($level, $code, $msg, $info = null, $backtrace = fal
 
 		// Build error object
 		$exception = new JException($msg, $code, $level, $info, $backtrace);
+
 		return self::throwError($exception);
 	}
 
@@ -212,6 +214,7 @@ public static function throwError(&$exception)
 		$handler = self::getErrorHandling($level);
 
 		$function = 'handle' . ucfirst($handler['mode']);
+
 		if (is_callable(array('JError', $function)))
 		{
 			$reference = call_user_func_array(array('JError', $function), array(&$exception, (isset($handler['options'])) ? $handler['options'] : array()));
@@ -375,6 +378,7 @@ public static function setErrorHandling($level, $mode, $options = null)
 				if (!is_callable($options))
 				{
 					$tmp = array('GLOBAL');
+
 					if (is_array($options))
 					{
 						$tmp[0] = $options[0];
@@ -396,6 +400,7 @@ public static function setErrorHandling($level, $mode, $options = null)
 
 			// Save settings
 			self::$handlers[$eLevel] = array('mode' => $mode);
+
 			if ($options != null)
 			{
 				self::$handlers[$eLevel]['options'] = $options;
@@ -537,6 +542,7 @@ public static function handleEcho(&$error, $options)
 		{
 			$backtrace = $error->getTrace();
 			$trace = '';
+
 			for ($i = count($backtrace) - 1; $i >= 0; $i--)
 			{
 				if (isset($backtrace[$i]['class']))
@@ -568,6 +574,7 @@ public static function handleEcho(&$error, $options)
 			if (defined('STDERR'))
 			{
 				fwrite(STDERR, "J$level_human: " . $error->get('message') . "\n");
+
 				if (defined('JDEBUG'))
 				{
 					fwrite(STDERR, $trace);
@@ -576,6 +583,7 @@ public static function handleEcho(&$error, $options)
 			else
 			{
 				echo "J$level_human: " . $error->get('message') . "\n";
+
 				if (defined('JDEBUG'))
 				{
 					echo $trace;
@@ -622,11 +630,11 @@ public static function handleVerbose(&$error, $options)
 		{
 			// Output as simple text
 			echo "J$level_human: " . $error->get('message') . "\n";
+
 			if ($info != null)
 			{
 				echo "\t" . $info . "\n";
 			}
-
 		}
 
 		return $error;
@@ -770,6 +778,7 @@ public static function customErrorPage(&$error)
 
 		$app = JFactory::getApplication();
 		$document = JDocument::getInstance('error');
+
 		if ($document)
 		{
 			$config = JFactory::getConfig();
@@ -810,6 +819,7 @@ public static function customErrorPage(&$error)
 			// This is a common use case for Command Line Interface applications.
 			self::handleEcho($error, array());
 		}
+
 		$app->close(0);
 	}
 
diff --git a/libraries/legacy/exception/exception.php b/libraries/legacy/exception/exception.php
index 41d99837a63c8..affdaa7c6902f 100644
--- a/libraries/legacy/exception/exception.php
+++ b/libraries/legacy/exception/exception.php
@@ -132,32 +132,39 @@ public function __construct($msg, $code = 0, $level = null, $info = null, $backt
 			for ($i = count($this->backtrace) - 1; $i >= 0; --$i)
 			{
 				++$i;
+
 				if (isset($this->backtrace[$i]['file']))
 				{
 					$this->file = $this->backtrace[$i]['file'];
 				}
+
 				if (isset($this->backtrace[$i]['line']))
 				{
 					$this->line = $this->backtrace[$i]['line'];
 				}
+
 				if (isset($this->backtrace[$i]['class']))
 				{
 					$this->class = $this->backtrace[$i]['class'];
 				}
+
 				if (isset($this->backtrace[$i]['function']))
 				{
 					$this->function = $this->backtrace[$i]['function'];
 				}
+
 				if (isset($this->backtrace[$i]['type']))
 				{
 					$this->type = $this->backtrace[$i]['type'];
 				}
 
 				$this->args = false;
+
 				if (isset($this->backtrace[$i]['args']))
 				{
 					$this->args = $this->backtrace[$i]['args'];
 				}
+
 				break;
 			}
 		}
@@ -219,6 +226,7 @@ public function get($property, $default = null)
 		{
 			return $this->$property;
 		}
+
 		return $default;
 	}
 
@@ -238,6 +246,7 @@ public function getProperties($public = true)
 		JLog::add('JException::getProperties is deprecated.', JLog::WARNING, 'deprecated');
 
 		$vars = get_object_vars($this);
+
 		if ($public)
 		{
 			foreach ($vars as $key => $value)
@@ -248,6 +257,7 @@ public function getProperties($public = true)
 				}
 			}
 		}
+
 		return $vars;
 	}
 
@@ -326,6 +336,7 @@ public function set($property, $value = null)
 
 		$previous = isset($this->$property) ? $this->$property : null;
 		$this->$property = $value;
+
 		return $previous;
 	}
 
diff --git a/libraries/legacy/form/field/category.php b/libraries/legacy/form/field/category.php
index 7586905c92a8d..c0319cd0b4d6d 100644
--- a/libraries/legacy/form/field/category.php
+++ b/libraries/legacy/form/field/category.php
@@ -61,7 +61,6 @@ protected function getOptions()
 			// Verify permissions.  If the action attribute is set, then we scan the options.
 			if ((string) $this->element['action'])
 			{
-
 				// Get the current user object.
 				$user = JFactory::getUser();
 
@@ -77,7 +76,6 @@ protected function getOptions()
 						unset($options[$i]);
 					}
 				}
-
 			}
 
 			if (isset($this->element['show_root']))
diff --git a/libraries/legacy/form/field/componentlayout.php b/libraries/legacy/form/field/componentlayout.php
index d79739984f4b5..3e7e90733d076 100644
--- a/libraries/legacy/form/field/componentlayout.php
+++ b/libraries/legacy/form/field/componentlayout.php
@@ -45,6 +45,7 @@ protected function getInput()
 		{
 			$clientId = $this->form->getValue('client_id');
 		}
+
 		$clientId = (int) $clientId;
 
 		$client = JApplicationHelper::getClientInfo($clientId);
@@ -78,7 +79,6 @@ protected function getInput()
 		// If a template, extension and view are present build the options.
 		if ($extn && $view && $client)
 		{
-
 			// Load language file
 			$lang = JFactory::getLanguage();
 			$lang->load($extn . '.sys', JPATH_ADMINISTRATOR, null, false, true)
@@ -179,10 +179,12 @@ protected function getInput()
 						// Files with corresponding XML files are alternate menu items, not alternate layout files
 						// so we need to exclude these files from the list.
 						$xml_files = JFolder::files($template_path, '^[^_]*\.xml$', false, true);
+
 						for ($j = 0, $count = count($xml_files); $j < $count; $j++)
 						{
 							$xml_files[$j] = basename($xml_files[$j], '.xml');
 						}
+
 						foreach ($files as $i => $file)
 						{
 							// Remove layout files that exist in the component folder or that have XML files
@@ -192,6 +194,7 @@ protected function getInput()
 								unset($files[$i]);
 							}
 						}
+
 						if (count($files))
 						{
 							// Create the group for the template
diff --git a/libraries/legacy/form/field/modulelayout.php b/libraries/legacy/form/field/modulelayout.php
index d82e1de37de3e..a1a83ee0f9e51 100644
--- a/libraries/legacy/form/field/modulelayout.php
+++ b/libraries/legacy/form/field/modulelayout.php
@@ -44,6 +44,7 @@ protected function getInput()
 		{
 			$clientId = $this->form->getValue('client_id');
 		}
+
 		$clientId = (int) $clientId;
 
 		$client = JApplicationHelper::getClientInfo($clientId);
@@ -73,7 +74,6 @@ protected function getInput()
 		// If an extension and view are present build the options.
 		if ($module && $client)
 		{
-
 			// Load language file
 			$lang = JFactory::getLanguage();
 			$lang->load($module . '.sys', $client->path, null, false, true)
@@ -195,7 +195,6 @@ protected function getInput()
 		}
 		else
 		{
-
 			return '';
 		}
 	}
diff --git a/libraries/legacy/model/admin.php b/libraries/legacy/model/admin.php
index 90e5affd3e253..d9312a5d0ad61 100644
--- a/libraries/legacy/model/admin.php
+++ b/libraries/legacy/model/admin.php
@@ -178,8 +178,8 @@ public function batch($commands, $pks, $contexts)
 		{
 			$type = new JUcmType;
 			$this->type = $type->getTypeByAlias($this->typeAlias);
-
 		}
+
 		if ($this->type === false)
 		{
 			$type = new JUcmType;
@@ -190,6 +190,7 @@ public function batch($commands, $pks, $contexts)
 		{
 			$typeAlias = $this->type->type_alias;
 		}
+
 		$this->tagsObserver = $this->table->getObserverOfClass('JTableObserverTags');
 
 		if (!empty($commands['category_id']))
@@ -250,6 +251,7 @@ public function batch($commands, $pks, $contexts)
 		if (!$done)
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+
 			return false;
 		}
 
@@ -675,13 +677,13 @@ public function checkin($pks = array())
 		{
 			if ($table->load($pk))
 			{
-
 				if ($table->checked_out > 0)
 				{
 					if (!parent::checkin($pk))
 					{
 						return false;
 					}
+
 					$count++;
 				}
 			}
@@ -733,13 +735,10 @@ public function delete(&$pks)
 		// Iterate the items to delete each one.
 		foreach ($pks as $i => $pk)
 		{
-
 			if ($table->load($pk))
 			{
-
 				if ($this->canDelete($table))
 				{
-
 					$context = $this->option . '.' . $this->name;
 
 					// Trigger the onContentBeforeDelete event.
@@ -748,41 +747,44 @@ public function delete(&$pks)
 					if (in_array(false, $result, true))
 					{
 						$this->setError($table->getError());
+
 						return false;
 					}
 
 					if (!$table->delete($pk))
 					{
 						$this->setError($table->getError());
+
 						return false;
 					}
 
 					// Trigger the onContentAfterDelete event.
 					$dispatcher->trigger($this->event_after_delete, array($context, $table));
-
 				}
 				else
 				{
-
 					// Prune items that you can't change.
 					unset($pks[$i]);
 					$error = $this->getError();
+
 					if ($error)
 					{
 						JLog::add($error, JLog::WARNING, 'jerror');
+
 						return false;
 					}
 					else
 					{
 						JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING, 'jerror');
+
 						return false;
 					}
 				}
-
 			}
 			else
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 		}
@@ -808,6 +810,7 @@ protected function generateNewTitle($category_id, $alias, $title)
 	{
 		// Alter the title & alias
 		$table = $this->getTable();
+
 		while ($table->load(array('alias' => $alias, 'catid' => $category_id)))
 		{
 			$title = JString::increment($title);
@@ -840,6 +843,7 @@ public function getItem($pk = null)
 			if ($return === false && $table->getError())
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 		}
@@ -1093,6 +1097,7 @@ public function save($data)
 			if (!$table->check())
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -1102,6 +1107,7 @@ public function save($data)
 			if (in_array(false, $result, true))
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -1109,6 +1115,7 @@ public function save($data)
 			if (!$table->store())
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -1129,6 +1136,7 @@ public function save($data)
 		{
 			$this->setState($this->getName() . '.id', $table->$key);
 		}
+
 		$this->setState($this->getName() . '.new', $isNew);
 
 		return true;
@@ -1182,6 +1190,7 @@ public function saveorder($pks = null, $order = null)
 				if (!$table->store())
 				{
 					$this->setError($table->getError());
+
 					return false;
 				}
 
@@ -1264,6 +1273,7 @@ protected function checkCategoryId($categoryId)
 				{
 					// Fatal error
 					$this->setError($error);
+
 					return false;
 				}
 				else
@@ -1278,6 +1288,7 @@ protected function checkCategoryId($categoryId)
 		if (empty($categoryId))
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
 			return false;
 		}
 
diff --git a/libraries/legacy/model/form.php b/libraries/legacy/model/form.php
index 6654f38e2f5b3..f9c2a19050edd 100644
--- a/libraries/legacy/model/form.php
+++ b/libraries/legacy/model/form.php
@@ -51,6 +51,7 @@ public function checkin($pk = null)
 			if (!$table->load($pk))
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -64,6 +65,7 @@ public function checkin($pk = null)
 			if ($table->checked_out > 0 && $table->checked_out != $user->get('id') && !$user->authorise('core.admin', 'com_checkin'))
 			{
 				$this->setError(JText::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'));
+
 				return false;
 			}
 
@@ -71,6 +73,7 @@ public function checkin($pk = null)
 			if (!$table->checkin($pk))
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 		}
@@ -98,6 +101,7 @@ public function checkout($pk = null)
 			if (!$table->load($pk))
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -113,6 +117,7 @@ public function checkout($pk = null)
 			if ($table->checked_out > 0 && $table->checked_out != $user->get('id'))
 			{
 				$this->setError(JText::_('JLIB_APPLICATION_ERROR_CHECKOUT_USER_MISMATCH'));
+
 				return false;
 			}
 
@@ -120,6 +125,7 @@ public function checkout($pk = null)
 			if (!$table->checkout($user->get('id'), $pk))
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 		}
@@ -193,11 +199,11 @@ protected function loadForm($name, $source = null, $options = array(), $clear =
 
 			// Load the data into the form after the plugins have operated.
 			$form->bind($data);
-
 		}
 		catch (Exception $e)
 		{
 			$this->setError($e->getMessage());
+
 			return false;
 		}
 
@@ -305,6 +311,7 @@ public function validate($form, $data, $group = null)
 		if ($return instanceof Exception)
 		{
 			$this->setError($return->getMessage());
+
 			return false;
 		}
 
diff --git a/libraries/legacy/model/legacy.php b/libraries/legacy/model/legacy.php
index 178df9697a9d0..649795c0e30cd 100644
--- a/libraries/legacy/model/legacy.php
+++ b/libraries/legacy/model/legacy.php
@@ -150,8 +150,8 @@ protected static function _createFileName($type, $parts = array())
 			case 'model':
 				$filename = strtolower($parts['name']) . '.php';
 				break;
-
 		}
+
 		return $filename;
 	}
 
@@ -175,10 +175,12 @@ public static function getInstance($type, $prefix = '', $config = array())
 		{
 			jimport('joomla.filesystem.path');
 			$path = JPath::find(self::addIncludePath(null, $prefix), self::_createFileName('model', array('name' => $type)));
+
 			if (!$path)
 			{
 				$path = JPath::find(self::addIncludePath(null, ''), self::_createFileName('model', array('name' => $type)));
 			}
+
 			if ($path)
 			{
 				require_once $path;
@@ -186,6 +188,7 @@ public static function getInstance($type, $prefix = '', $config = array())
 				if (!class_exists($modelClass))
 				{
 					JLog::add(JText::sprintf('JLIB_APPLICATION_ERROR_MODELCLASS_NOT_FOUND', $modelClass), JLog::WARNING, 'jerror');
+
 					return false;
 				}
 			}
@@ -280,7 +283,6 @@ public function __construct($config = array())
 		{
 			$this->event_clean_cache = 'onContentCleanCache';
 		}
-
 	}
 
 	/**
@@ -321,9 +323,10 @@ protected function _getListCount($query)
 			&& $query->having === null)
 		{
 			$query = clone $query;
-			$query->clear('select')->clear('order')->select('COUNT(*)');
+			$query->clear('select')->clear('order')->clear('limit')->select('COUNT(*)');
 
 			$this->_db->setQuery($query);
+
 			return (int) $this->_db->loadResult();
 		}
 
@@ -387,10 +390,12 @@ public function getName()
 		if (empty($this->name))
 		{
 			$r = null;
+
 			if (!preg_match('/Model(.*)/i', get_class($this), $r))
 			{
 				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_MODEL_GET_NAME'), 500);
 			}
+
 			$this->name = strtolower($r[1]);
 		}
 
diff --git a/libraries/legacy/request/request.php b/libraries/legacy/request/request.php
index a83bbd4cd5458..631f0cd109d77 100644
--- a/libraries/legacy/request/request.php
+++ b/libraries/legacy/request/request.php
@@ -49,6 +49,7 @@ class JRequest
 	public static function getURI()
 	{
 		$uri = JUri::getInstance();
+
 		return $uri->toString(array('path', 'query'));
 	}
 
@@ -64,6 +65,7 @@ public static function getURI()
 	public static function getMethod()
 	{
 		$method = strtoupper($_SERVER['REQUEST_METHOD']);
+
 		return $method;
 	}
 
@@ -102,10 +104,12 @@ public static function getVar($name, $default = null, $hash = 'default', $type =
 	{
 		// Ensure hash and type are uppercase
 		$hash = strtoupper($hash);
+
 		if ($hash === 'METHOD')
 		{
 			$hash = strtoupper($_SERVER['REQUEST_METHOD']);
 		}
+
 		$type = strtoupper($type);
 		$sig = $hash . $type . $mask;
 
@@ -351,6 +355,7 @@ public static function setVar($name, $value = null, $hash = 'method', $overwrite
 
 		// Get the request hash value
 		$hash = strtoupper($hash);
+
 		if ($hash === 'METHOD')
 		{
 			$hash = strtoupper($_SERVER['REQUEST_METHOD']);
@@ -549,6 +554,7 @@ protected static function _cleanVar($var, $mask = 0, $type = null)
 			$noHtmlFilter = JFilterInput::getInstance();
 			$var = $noHtmlFilter->clean($var, $type);
 		}
+
 		return $var;
 	}
 }
diff --git a/libraries/legacy/table/menu.php b/libraries/legacy/table/menu.php
index 3149978d97254..37da80ca2c7f1 100644
--- a/libraries/legacy/table/menu.php
+++ b/libraries/legacy/table/menu.php
@@ -161,7 +161,14 @@ public function store($updateNulls = false)
 		// Verify that the alias is unique
 		$table = JTable::getInstance('Menu', 'JTable', array('dbo' => $this->getDbo()));
 
-		if ($table->load(array('alias' => $this->alias, 'parent_id' => $this->parent_id, 'client_id' => (int) $this->client_id, 'language' => $this->language))
+		if ($table->load(
+				array(
+				'alias' => $this->alias,
+				'parent_id' => $this->parent_id,
+				'client_id' => (int) $this->client_id,
+				'language' => $this->language
+				)
+			)
 			&& ($table->id != $this->id || $this->id == 0))
 		{
 			if ($this->menutype == $table->menutype)
diff --git a/libraries/legacy/utilities/xmlelement.php b/libraries/legacy/utilities/xmlelement.php
index b7b8e075ba917..e34715b13d41f 100644
--- a/libraries/legacy/utilities/xmlelement.php
+++ b/libraries/legacy/utilities/xmlelement.php
@@ -32,6 +32,7 @@ class JXMLElement extends SimpleXMLElement
 	public function name()
 	{
 		JLog::add('JXMLElement::name() is deprecated, use SimpleXMLElement::getName() instead.', JLog::WARNING, 'deprecated');
+
 		return (string) $this->getName();
 	}
 
@@ -89,7 +90,6 @@ public function asFormattedXML($compressed = false, $indent = "\t", $level = 0)
 
 				// Add the newline and indentation to go along with the close tag
 				$out .= ($compressed) ? '' : "\n" . str_repeat($indent, $level);
-
 			}
 			elseif ((string) $this)
 			{
diff --git a/libraries/legacy/view/category.php b/libraries/legacy/view/category.php
index d249dfcef3442..890855fed8710 100644
--- a/libraries/legacy/view/category.php
+++ b/libraries/legacy/view/category.php
@@ -139,7 +139,7 @@ public function commonCategoryDisplay()
 
 		// Setup the category parameters.
 		$cparams          = $category->getParams();
-		$category->params = clone($params);
+		$category->params = clone $params;
 		$category->params->merge($cparams);
 
 		$children = array($category->id => $children);
diff --git a/libraries/legacy/view/legacy.php b/libraries/legacy/view/legacy.php
index f70569f958897..30a8523f119d4 100644
--- a/libraries/legacy/view/legacy.php
+++ b/libraries/legacy/view/legacy.php
@@ -209,6 +209,7 @@ public function __construct($config = array())
 	public function display($tpl = null)
 	{
 		$result = $this->loadTemplate($tpl);
+
 		if ($result instanceof Exception)
 		{
 			return $result;
@@ -273,6 +274,7 @@ public function assign()
 					$this->$key = $val;
 				}
 			}
+
 			return true;
 		}
 
@@ -286,6 +288,7 @@ public function assign()
 					$this->$key = $val;
 				}
 			}
+
 			return true;
 		}
 
@@ -296,6 +299,7 @@ public function assign()
 		if (is_string($arg0) && substr($arg0, 0, 1) != '_' && func_num_args() > 1)
 		{
 			$this->$arg0 = $arg1;
+
 			return true;
 		}
 
@@ -335,6 +339,7 @@ public function assignRef($key, &$val)
 		if (is_string($key) && substr($key, 0, 1) != '_')
 		{
 			$this->$key = &$val;
+
 			return true;
 		}
 
@@ -396,9 +401,9 @@ public function get($property, $default = null)
 			{
 				// The method exists, let's call it and return what we get
 				$result = $this->_models[$model]->$method();
+
 				return $result;
 			}
-
 		}
 
 		// Degrade to JObject::get
@@ -422,6 +427,7 @@ public function getModel($name = null)
 		{
 			$name = $this->_defaultModel;
 		}
+
 		return $this->_models[strtolower($name)];
 	}
 
@@ -497,6 +503,7 @@ public function setModel($model, $default = false)
 		{
 			$this->_defaultModel = $name;
 		}
+
 		return $model;
 	}
 
@@ -512,6 +519,7 @@ public function setModel($model, $default = false)
 	public function setLayout($layout)
 	{
 		$previous = $this->_layout;
+
 		if (strpos($layout, ':') === false)
 		{
 			$this->_layout = $layout;
@@ -541,6 +549,7 @@ public function setLayout($layout)
 	public function setLayoutExt($value)
 	{
 		$previous = $this->_layoutExt;
+
 		if ($value = preg_replace('#[^A-Za-z0-9]#', '', trim($value)))
 		{
 			$this->_layoutExt = $value;
@@ -791,6 +800,7 @@ protected function _createFileName($type, $parts = array())
 				$filename = strtolower($parts['name']) . '.php';
 				break;
 		}
+
 		return $filename;
 	}
 
@@ -807,6 +817,7 @@ public function getForm()
 		{
 			$this->form = $this->get('Form');
 		}
+
 		return $this->form;
 	}
 }
diff --git a/libraries/loader.php b/libraries/loader.php
index e593146502231..916a04bae8dd7 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -280,6 +280,8 @@ public static function registerPrefix($prefix, $path, $reset = false, $prepend =
 		// Verify the library path exists.
 		if (!file_exists($path))
 		{
+			$path = (str_replace(JPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(JPATH_ROOT, '', $path);
+
 			throw new RuntimeException('Library path ' . $path . ' cannot be found.', 500);
 		}
 
@@ -344,6 +346,8 @@ public static function registerNamespace($namespace, $path, $reset = false, $pre
 		// Verify the library path exists.
 		if (!file_exists($path))
 		{
+			$path = (str_replace(JPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(JPATH_ROOT, '', $path);
+
 			throw new RuntimeException('Library path ' . $path . ' cannot be found.', 500);
 		}
 
diff --git a/media/jui/css/bootstrap-rtl.css b/media/jui/css/bootstrap-rtl.css
index d63d12417457b..9f5766a8d1228 100644
--- a/media/jui/css/bootstrap-rtl.css
+++ b/media/jui/css/bootstrap-rtl.css
@@ -588,3 +588,12 @@ input[type="url"] {
 	text-align: left;
 	direction: ltr;
 }
+#aside .nav .nav-child {
+	border-left: 0;
+	border-right: 2px solid #ddd;
+	padding-left: 0;
+	padding-right: 5px;
+}
+.dropdown-menu {
+	text-align: right;
+}
diff --git a/media/jui/less/bootstrap-rtl.less b/media/jui/less/bootstrap-rtl.less
index 168e26d60849a..d70a241a86183 100644
--- a/media/jui/less/bootstrap-rtl.less
+++ b/media/jui/less/bootstrap-rtl.less
@@ -593,4 +593,17 @@ direction:rtl;
 input[type="url"] {
 	text-align: left;
 	direction: ltr;
+}
+
+/* Menu Module front-end */
+#aside .nav .nav-child {
+	border-left: 0;
+	border-right: 2px solid #ddd;
+	padding-left: 0;
+	padding-right: 5px;
+}
+
+/* Dropdown frontend */
+.dropdown-menu {
+	text-align: right;
 }
\ No newline at end of file
diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
index fc36c2166bc98..347c0d64315dd 100644
--- a/media/system/js/core-uncompressed.js
+++ b/media/system/js/core-uncompressed.js
@@ -212,6 +212,59 @@ Joomla.popupWindow = function(mypage, myname, w, h, scroll) {
     win.window.focus();
 }
 
+/**
+ * USED IN: All list views to hide/show the sidebar
+ */
+Joomla.toggleSidebar = function(force)
+{
+	var context = 'jsidebar';
+
+	var $visible = jQuery('#sidebar').is(":visible");
+
+	if (force)
+	{
+		// Load the value from localStorage
+		if (typeof(Storage) !== "undefined")
+		{
+			var $visible = localStorage.getItem(context);
+		}
+
+		// Need to convert the value to a boolean
+		$visible = ($visible == 'true') ? true : false;
+	}
+
+	if ($visible)
+	{
+		jQuery('#sidebar').hide();
+		jQuery('#j-sidebar-container').removeClass('span2').addClass('span1');
+        jQuery('#j-sidebar-container').removeClass('j-toggle-visible').addClass('j-toggle-hidden');
+		jQuery('#j-main-container').removeClass('span10').addClass('span12 expanded');
+		jQuery('#j-toggle-sidebar-icon').removeClass('icon-remove').addClass('icon-menu-3');
+		jQuery('#j-toggle-sidebar-button').attr('data-original-title', Joomla.JText._('JSEARCH_SHOW_SIDEBAR'));
+
+		if (typeof(Storage) !== "undefined")
+		{
+			// Set the last selection in localStorage
+			localStorage.setItem(context, true);
+		}
+	}
+	else
+	{
+		jQuery('#sidebar').show();
+		jQuery('#j-sidebar-container').removeClass('span1').addClass('span2');
+        jQuery('#j-sidebar-container').removeClass('j-toggle-hidden').addClass('j-toggle-visible');
+		jQuery('#j-main-container').removeClass('span12 expanded').addClass('span10');
+		jQuery('#j-toggle-sidebar-icon').removeClass('icon-menu-3').addClass('icon-remove');
+		jQuery('#j-toggle-sidebar-button').attr('data-original-title', Joomla.JText._('JSEARCH_HIDE_SIDEBAR'));
+
+		if (typeof(Storage) !== "undefined")
+		{
+			// Set the last selection in localStorage
+			localStorage.setItem(context, false);
+		}
+	}
+}
+
 /**
  * USED IN: libraries/joomla/html/html/grid.php
  */
diff --git a/media/system/js/core.js b/media/system/js/core.js
index 1d369e3ca7676..380719d9d4ea9 100644
--- a/media/system/js/core.js
+++ b/media/system/js/core.js
@@ -1 +1 @@
-Joomla=window.Joomla||{};Joomla.editors={};Joomla.editors.instances={};Joomla.submitform=function(a,b){if(typeof(b)==="undefined"){b=document.getElementById("adminForm")}if(typeof(a)!=="undefined"&&a!==""){b.task.value=a}if(typeof b.onsubmit=="function"){b.onsubmit()}if(typeof b.fireEvent=="function"){b.fireEvent("submit")}b.submit()};Joomla.submitbutton=function(a){Joomla.submitform(a)};Joomla.JText={strings:{},_:function(a,b){return typeof this.strings[a.toUpperCase()]!=="undefined"?this.strings[a.toUpperCase()]:b},load:function(a){for(var b in a){this.strings[b.toUpperCase()]=a[b]}return this}};Joomla.replaceTokens=function(c){var b=document.getElementsByTagName("input"),a;for(a=0;a<b.length;a++){if((b[a].type=="hidden")&&(b[a].name.length==32)&&b[a].value=="1"){b[a].name=c}}};Joomla.isEmail=function(b){var a=new RegExp("^[\\w-_.]*[\\w-_.]@[\\w].+[\\w]+[\\w]$");return a.test(b)};Joomla.checkAll=function(b,f){if(!f){f="cb"}if(b.form){var g=0,a,d;for(a=0,n=b.form.elements.length;a<n;a++){d=b.form.elements[a];if(d.type==b.type){if((f&&d.id.indexOf(f)==0)||!f){d.checked=b.checked;g+=(d.checked==true?1:0)}}}if(b.form.boxchecked){b.form.boxchecked.value=g}return true}return false};Joomla.renderMessages=function(d){var e=jQuery.noConflict(),g,b,a,f,c;Joomla.removeMessages();g=e("#system-message-container");e.each(d,function(h,j){b=e("<div/>",{id:"system-message","class":"alert alert-"+h});g.append(b);a=e("<h4/>",{"class":"alert-heading",text:Joomla.JText._(h)});b.append(a);f=e("<div/>");e.each(j,function(k,l){c=e("<p/>",{html:l});f.append(c)});b.append(f)})};Joomla.removeMessages=function(){jQuery("#system-message-container").empty()};Joomla.isChecked=function(a,d){if(typeof(d)==="undefined"){d=document.getElementById("adminForm")}if(a==true){d.boxchecked.value++}else{d.boxchecked.value--}var g=true,b,f;for(b=0,n=d.elements.length;b<n;b++){f=d.elements[b];if(f.type=="checkbox"){if(f.name!="checkall-toggle"&&f.checked==false){g=false;break}}}if(d.elements["checkall-toggle"]){d.elements["checkall-toggle"].checked=g}};Joomla.popupWindow=function(e,k,j,c,f){var g=(screen.width-j)/2,b,a,d;b=(screen.height-c)/2;a="height="+c+",width="+j+",top="+b+",left="+g+",scrollbars="+f+",resizable";d=window.open(e,k,a);d.window.focus()};Joomla.tableOrdering=function(a,c,b,d){if(typeof(d)==="undefined"){d=document.getElementById("adminForm")}d.filter_order.value=a;d.filter_order_Dir.value=c;Joomla.submitform(b,d)};function writeDynaList(e,g,d,h,a){var c="\n  <select "+e+">",b,f;b=0;for(x in g){if(g[x][0]==d){f="";if((h==d&&a==g[x][1])||(b==0&&h!=d)){f='selected="selected"'}c+='\n     <option value="'+g[x][1]+'" '+f+">"+g[x][2]+"</option>"}b++}c+="\n </select>";document.writeln(c)}function changeDynaList(c,e,b,f,a){var d=document.adminForm[c];for(i in d.options.length){d.options[i]=null}i=0;for(x in e){if(e[x][0]==b){opt=new Option();opt.value=e[x][1];opt.text=e[x][2];if((f==b&&a==opt.value)||i==0){opt.selected=true}d.options[i++]=opt}}d.length=i}function radioGetCheckedValue(b){if(!b){return""}var c=b.length,a;if(c==undefined){if(b.checked){return b.value}else{return""}}for(a=0;a<c;a++){if(b[a].checked){return b[a].value}}return""}function getSelectedValue(b,a){var c=document[b],d=c[a];i=d.selectedIndex;if(i!=null&&i>-1){return d.options[i].value}else{return null}}function listItemTask(g,b){var d=document.adminForm,c,e,a=d[g];if(a){for(c=0;true;c++){e=d["cb"+c];if(!e){break}e.checked=false}a.checked=true;d.boxchecked.value=1;submitbutton(b)}return false}function submitbutton(a){submitform(a)}function submitform(a){if(a){document.adminForm.task.value=a}if(typeof document.adminForm.onsubmit=="function"){document.adminForm.onsubmit()}if(typeof document.adminForm.fireEvent=="function"){document.adminForm.fireEvent("submit")}document.adminForm.submit()}function saveorder(b,a){checkAll_button(b,a)}function checkAll_button(d,a){if(!a){a="saveorder"}var b,c;for(b=0;b<=d;b++){c=document.adminForm["cb"+b];if(c){if(c.checked==false){c.checked=true}}else{alert("You cannot change the order of items, as an item in the list is `Checked Out`");return}}submitform(a)};
\ No newline at end of file
+Joomla=window.Joomla||{};Joomla.editors={};Joomla.editors.instances={};Joomla.submitform=function(task,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}if(typeof task!=="undefined"&&task!==""){form.task.value=task}if(typeof form.onsubmit=="function"){form.onsubmit()}if(typeof form.fireEvent=="function"){form.fireEvent("submit")}form.submit()};Joomla.submitbutton=function(pressbutton){Joomla.submitform(pressbutton)};Joomla.JText={strings:{},_:function(key,def){return typeof this.strings[key.toUpperCase()]!=="undefined"?this.strings[key.toUpperCase()]:def},load:function(object){for(var key in object){this.strings[key.toUpperCase()]=object[key]}return this}};Joomla.replaceTokens=function(n){var els=document.getElementsByTagName("input"),i;for(i=0;i<els.length;i++){if(els[i].type=="hidden"&&els[i].name.length==32&&els[i].value=="1"){els[i].name=n}}};Joomla.isEmail=function(text){var regex=new RegExp("^[\\w-_.]*[\\w-_.]@[\\w].+[\\w]+[\\w]$");return regex.test(text)};Joomla.checkAll=function(checkbox,stub){if(!stub){stub="cb"}if(checkbox.form){var c=0,i,e;for(i=0,n=checkbox.form.elements.length;i<n;i++){e=checkbox.form.elements[i];if(e.type==checkbox.type){if(stub&&e.id.indexOf(stub)==0||!stub){e.checked=checkbox.checked;c+=e.checked==true?1:0}}}if(checkbox.form.boxchecked){checkbox.form.boxchecked.value=c}return true}return false};Joomla.renderMessages=function(messages){var $=jQuery.noConflict(),$container,$div,$h4,$divList,$p;Joomla.removeMessages();$container=$("#system-message-container");$.each(messages,function(type,item){$div=$("<div/>",{id:"system-message","class":"alert alert-"+type});$container.append($div);$h4=$("<h4/>",{"class":"alert-heading",text:Joomla.JText._(type)});$div.append($h4);$divList=$("<div/>");$.each(item,function(index,item){$p=$("<p/>",{html:item});$divList.append($p)});$div.append($divList)})};Joomla.removeMessages=function(){jQuery("#system-message-container").empty()};Joomla.isChecked=function(isitchecked,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}if(isitchecked==true){form.boxchecked.value++}else{form.boxchecked.value--}var c=true,i,e;for(i=0,n=form.elements.length;i<n;i++){e=form.elements[i];if(e.type=="checkbox"){if(e.name!="checkall-toggle"&&e.checked==false){c=false;break}}}if(form.elements["checkall-toggle"]){form.elements["checkall-toggle"].checked=c}};Joomla.popupWindow=function(mypage,myname,w,h,scroll){var winl=(screen.width-w)/2,wint,winprops,win;wint=(screen.height-h)/2;winprops="height="+h+",width="+w+",top="+wint+",left="+winl+",scrollbars="+scroll+",resizable";win=window.open(mypage,myname,winprops);win.window.focus()};Joomla.toggleSidebar=function(force){var context="jsidebar";var $visible=jQuery("#sidebar").is(":visible");if(force){if(typeof Storage!=="undefined"){var $visible=localStorage.getItem(context)}$visible=$visible=="true"?true:false}if($visible){jQuery("#sidebar").hide();jQuery("#j-sidebar-container").removeClass("span2").addClass("span1");jQuery("#j-sidebar-container").removeClass("j-toggle-visible").addClass("j-toggle-hidden");jQuery("#j-main-container").removeClass("span10").addClass("span12 expanded");jQuery("#j-toggle-sidebar-icon").removeClass("icon-remove").addClass("icon-menu-3");jQuery("#j-toggle-sidebar-button").attr("data-original-title",Joomla.JText._("JSEARCH_SHOW_SIDEBAR"));if(typeof Storage!=="undefined"){localStorage.setItem(context,true)}}else{jQuery("#sidebar").show();jQuery("#j-sidebar-container").removeClass("span1").addClass("span2");jQuery("#j-sidebar-container").removeClass("j-toggle-hidden").addClass("j-toggle-visible");jQuery("#j-main-container").removeClass("span12 expanded").addClass("span10");jQuery("#j-toggle-sidebar-icon").removeClass("icon-menu-3").addClass("icon-remove");jQuery("#j-toggle-sidebar-button").attr("data-original-title",Joomla.JText._("JSEARCH_HIDE_SIDEBAR"));if(typeof Storage!=="undefined"){localStorage.setItem(context,false)}}};Joomla.tableOrdering=function(order,dir,task,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.filter_order.value=order;form.filter_order_Dir.value=dir;Joomla.submitform(task,form)};function writeDynaList(selectParams,source,key,orig_key,orig_val){var html="\n  <select "+selectParams+">",i,selected;i=0;for(x in source){if(source[x][0]==key){selected="";if(orig_key==key&&orig_val==source[x][1]||i==0&&orig_key!=key){selected='selected="selected"'}html+='\n     <option value="'+source[x][1]+'" '+selected+">"+source[x][2]+"</option>"}i++}html+="\n </select>";document.writeln(html)}function changeDynaList(listname,source,key,orig_key,orig_val){var list=document.adminForm[listname];for(i in list.options.length){list.options[i]=null}i=0;for(x in source){if(source[x][0]==key){opt=new Option;opt.value=source[x][1];opt.text=source[x][2];if(orig_key==key&&orig_val==opt.value||i==0){opt.selected=true}list.options[i++]=opt}}list.length=i}function radioGetCheckedValue(radioObj){if(!radioObj){return""}var n=radioObj.length,i;if(n==undefined){if(radioObj.checked){return radioObj.value}else{return""}}for(i=0;i<n;i++){if(radioObj[i].checked){return radioObj[i].value}}return""}function getSelectedValue(frmName,srcListName){var form=document[frmName],srcList=form[srcListName];i=srcList.selectedIndex;if(i!=null&&i>-1){return srcList.options[i].value}else{return null}}function listItemTask(id,task){var f=document.adminForm,i,cbx,cb=f[id];if(cb){for(i=0;true;i++){cbx=f["cb"+i];if(!cbx)break;cbx.checked=false}cb.checked=true;f.boxchecked.value=1;submitbutton(task)}return false}function submitbutton(pressbutton){submitform(pressbutton)}function submitform(pressbutton){if(pressbutton){document.adminForm.task.value=pressbutton}if(typeof document.adminForm.onsubmit=="function"){document.adminForm.onsubmit()}if(typeof document.adminForm.fireEvent=="function"){document.adminForm.fireEvent("submit")}document.adminForm.submit()}function saveorder(n,task){checkAll_button(n,task)}function checkAll_button(n,task){if(!task){task="saveorder"}var j,box;for(j=0;j<=n;j++){box=document.adminForm["cb"+j];if(box){if(box.checked==false){box.checked=true}}else{alert("You cannot change the order of items, as an item in the list is `Checked Out`");return}}submitform(task)}
\ No newline at end of file
diff --git a/media/system/js/helpsite.js b/media/system/js/helpsite.js
index aff38400153e6..132861ba65700 100644
--- a/media/system/js/helpsite.js
+++ b/media/system/js/helpsite.js
@@ -12,7 +12,7 @@ jQuery(document).ready(function() {
 	{
 		// Uses global variable helpsite_base for bast uri
 		var select_id = jQuery(this).attr('rel');
-		jQuery.getJSON(helpsite_base + '/index.php?option=com_users&task=profile.gethelpsites&format=json', function(data){
+		jQuery.getJSON(helpsite_base + 'index.php?option=com_users&task=profile.gethelpsites&format=json', function(data){
 			// The response contains the options to use in help site select field
 			var items = [];
 
diff --git a/modules/mod_articles_archive/helper.php b/modules/mod_articles_archive/helper.php
index 08a5f5eb89d24..a126de364ccdd 100644
--- a/modules/mod_articles_archive/helper.php
+++ b/modules/mod_articles_archive/helper.php
@@ -23,12 +23,14 @@ class ModArchiveHelper
 	 *
 	 * @param   JRegistry  &$params  module parameters
 	 *
-	 * @return array
+	 * @return  array
+	 *
+	 * @since   1.5
 	 */
 	public static function getList(&$params)
 	{
 		// Get database
-		$db = JFactory::getDbo();
+		$db    = JFactory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select($query->month($db->quoteName('created')) . ' AS created_month')
 			->select('created, id, title')
@@ -46,12 +48,12 @@ public static function getList(&$params)
 		$db->setQuery($query, 0, (int) $params->get('count'));
 		$rows = (array) $db->loadObjectList();
 
-		$app = JFactory::getApplication();
-		$menu = $app->getMenu();
-		$item = $menu->getItems('link', 'index.php?option=com_content&view=archive', true);
+		$app    = JFactory::getApplication();
+		$menu   = $app->getMenu();
+		$item   = $menu->getItems('link', 'index.php?option=com_content&view=archive', true);
 		$itemid = (isset($item) && !empty($item->id)) ? '&Itemid=' . $item->id : '';
 
-		$i = 0;
+		$i     = 0;
 		$lists = array();
 
 		foreach ($rows as $row)
@@ -59,10 +61,10 @@ public static function getList(&$params)
 			$date = JFactory::getDate($row->created);
 
 			$created_month = $date->format('n');
-			$created_year = $date->format('Y');
+			$created_year  = $date->format('Y');
 
 			$created_year_cal = JHTML::_('date', $row->created, 'Y');
-			$month_name_cal = JHTML::_('date', $row->created, 'F');
+			$month_name_cal   = JHTML::_('date', $row->created, 'F');
 
 			$lists[$i] = new stdClass;
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.php b/modules/mod_articles_archive/mod_articles_archive.php
index 5e19b9748640b..ecab4ba922d81 100644
--- a/modules/mod_articles_archive/mod_articles_archive.php
+++ b/modules/mod_articles_archive/mod_articles_archive.php
@@ -14,6 +14,6 @@
 
 $params->def('count', 10);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));
-$list = ModArchiveHelper::getList($params);
+$list            = ModArchiveHelper::getList($params);
 
 require JModuleHelper::getLayoutPath('mod_articles_archive', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index ef59b14f2b465..fe7ccf31e3fe4 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="module" version="3.1" client="site"
-	method="upgrade"
->
+<extension type="module" version="3.1" client="site" method="upgrade">
 	<name>mod_articles_archive</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2014 Open Source Matters.
-		All rights reserved.</copyright>
-	<license>GNU General Public License version 2 or later; see
-		LICENSE.txt</license>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
@@ -28,22 +24,31 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
-				<field name="count" type="text"
+				<field
+					name="count"
+					type="text"
 					default="10"
 					label="MOD_ARTICLES_ARCHIVE_FIELD_COUNT_LABEL"
 					description="MOD_ARTICLES_ARCHIVE_FIELD_COUNT_DESC" />
 			</fieldset>
 
 			<fieldset name="advanced">
-				<field name="layout" type="modulelayout"
+				<field
+					name="layout"
+					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
 
-				<field name="moduleclass_sfx" type="textarea" rows="3"
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					rows="3"
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
 
-				<field name="cache" type="list"
+				<field
+					name="cache"
+					type="list"
 					default="1"
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					description="COM_MODULES_FIELD_CACHING_DESC"
@@ -52,10 +57,13 @@
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
 
-				<field name="cache_time" type="text"
+				<field
+					name="cache_time"
+					type="text"
 					default="900"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+
 				<field
 					name="cachemode"
 					type="hidden"
diff --git a/modules/mod_articles_archive/tmpl/default.php b/modules/mod_articles_archive/tmpl/default.php
index 70ed3ce7593bf..b206a5ed66ca0 100644
--- a/modules/mod_articles_archive/tmpl/default.php
+++ b/modules/mod_articles_archive/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<?php if (!empty($list)) :?>
+<?php if (!empty($list)) : ?>
 	<ul class="archive-module<?php echo $moduleclass_sfx; ?>">
 	<?php foreach ($list as $item) : ?>
 	<li>
diff --git a/modules/mod_articles_categories/helper.php b/modules/mod_articles_categories/helper.php
index 89615ecbff41d..dfcd0804cde9f 100644
--- a/modules/mod_articles_categories/helper.php
+++ b/modules/mod_articles_categories/helper.php
@@ -17,7 +17,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @since       1.5.0
+ * @since       1.5
  */
 abstract class ModArticlesCategoriesHelper
 {
@@ -26,15 +26,17 @@ abstract class ModArticlesCategoriesHelper
 	 *
 	 * @param   JRegistry  &$params  module parameters
 	 *
-	 * @return array
+	 * @return  array
+	 *
+	 * @since   1.5
 	 */
 	public static function getList(&$params)
 	{
-		$options = array();
+		$options               = array();
 		$options['countItems'] = $params->get('numitems', 0);
 
 		$categories = JCategories::getInstance('Content', $options);
-		$category = $categories->get($params->get('parent', 'root'));
+		$category   = $categories->get($params->get('parent', 'root'));
 
 		if ($category != null)
 		{
diff --git a/modules/mod_articles_categories/mod_articles_categories.php b/modules/mod_articles_categories/mod_articles_categories.php
index 374b85f4553e7..c024a9dc5865b 100644
--- a/modules/mod_articles_categories/mod_articles_categories.php
+++ b/modules/mod_articles_categories/mod_articles_categories.php
@@ -12,20 +12,22 @@
 // Include the helper functions only once
 require_once __DIR__ . '/helper.php';
 
-$cacheid = md5(serialize($module->module));
+JLoader::register('JCategoryNode', JPATH_BASE . '/libraries/legacy/categories/categories.php');
 
-$cacheparams = new stdClass;
-$cacheparams->cachemode = 'id';
-$cacheparams->class = 'ModArticlesCategoriesHelper';
-$cacheparams->method = 'getList';
+$cacheid = md5($module->id);
+
+$cacheparams               = new stdClass;
+$cacheparams->cachemode    = 'id';
+$cacheparams->class        = 'ModArticlesCategoriesHelper';
+$cacheparams->method       = 'getList';
 $cacheparams->methodparams = $params;
-$cacheparams->modeparams = $cacheid;
+$cacheparams->modeparams   = $cacheid;
 
 $list = JModuleHelper::moduleCache($module, $params, $cacheparams);
 
 if (!empty($list))
 {
 	$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));
-	$startLevel = reset($list)->getParent()->level;
+	$startLevel      = reset($list)->getParent()->level;
 	require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default'));
 }
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index 746a15eacf389..950e26a5132c7 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension
-	type="module" version="3.1" client="site" method="upgrade">
+<extension type="module" version="3.1" client="site" method="upgrade">
 	<name>mod_articles_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
@@ -23,110 +22,136 @@
 	</languages>
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES" />
 	<config>
-	<fields name="params">
-		<fieldset name="basic">
-			<field
-				name="parent"
-				type="category"
-				extension="com_content"
-				published=""
-				label="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_DESC"/>
-			<field
-				name="show_description"
-				type="radio"
-				class="btn-group btn-group-yesno"
-				default="0"
-				label="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
-			</field>
-			<field
-				name="numitems"
-				type="radio"
-				class="btn-group btn-group-yesno"
-				default="0"
-				label="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
-			</field>
-			<field
-				name="show_children"
-				type="radio"
-				class="btn-group btn-group-yesno"
-				default="0"
-				label="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
-			</field>
-			<field name="count" type="list"
-				label="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_DESC"
-				default="0"
-			>
-				<option value="0">JALL</option>
-				<option value="1">J1</option>
-				<option value="2">J2</option>
-				<option value="3">J3</option>
-				<option value="4">J4</option>
-				<option value="5">J5</option>
-				<option value="6">J6</option>
-				<option value="7">J7</option>
-				<option value="8">J8</option>
-				<option value="9">J9</option>
-				<option value="10">J10</option>
-		</field>
-
-			<field name="maxlevel" type="list"
-				label="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_DESC"
-				default="0"
-			>
-				<option value="0">JALL</option>
-				<option value="1">J1</option>
-				<option value="2">J2</option>
-				<option value="3">J3</option>
-				<option value="4">J4</option>
-				<option value="5">J5</option>
-				<option value="6">J6</option>
-				<option value="7">J7</option>
-				<option value="8">J8</option>
-				<option value="9">J9</option>
-				<option value="10">J10</option>
-		</field>
-
-		</fieldset>
-		<fieldset name="advanced">
-			<field name="layout" type="modulelayout"
-				label="JFIELD_ALT_LAYOUT_LABEL" description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
-			<field name="item_heading" type="list" default="4"
-				label="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_LABEL"
-				description="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_DESC"
-			>
-				<option value="1">JH1</option>
-				<option value="2">JH2</option>
-				<option value="3">JH3</option>
-				<option value="4">JH4</option>
-				<option value="5">JH5</option>
-			</field>
-
-			<field name="moduleclass_sfx" type="textarea" rows="3"
-				label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-				description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
-
-			<field name="owncache" type="list" default="1"
-				label="COM_MODULES_FIELD_CACHING_LABEL" description="COM_MODULES_FIELD_CACHING_DESC" >
-				<option value="1">JGLOBAL_USE_GLOBAL</option>
-				<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING
-				</option>
-			</field>
-
-			<field name="cache_time" type="text" default="900"
-				label="COM_MODULES_FIELD_CACHE_TIME_LABEL" description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
-		</fieldset>
-	</fields>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="parent"
+					type="category"
+					extension="com_content"
+					published=""
+					label="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_DESC"/>
+	
+				<field
+					name="show_description"
+					type="radio"
+					class="btn-group btn-group-yesno"
+					default="0"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_DESC">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+	
+				<field
+					name="numitems"
+					type="radio"
+					class="btn-group btn-group-yesno"
+					default="0"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_DESC">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+	
+				<field
+					name="show_children"
+					type="radio"
+					class="btn-group btn-group-yesno"
+					default="0"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_DESC">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+	
+				<field
+					name="count"
+					type="list"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_DESC"
+					default="0"
+				>
+					<option value="0">JALL</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+					<option value="6">J6</option>
+					<option value="7">J7</option>
+					<option value="8">J8</option>
+					<option value="9">J9</option>
+					<option value="10">J10</option>
+				</field>
+	
+				<field
+					name="maxlevel"
+					type="list"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_DESC"
+					default="0"
+				>
+					<option value="0">JALL</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+					<option value="6">J6</option>
+					<option value="7">J7</option>
+					<option value="8">J8</option>
+					<option value="9">J9</option>
+					<option value="10">J10</option>
+				</field>
+			</fieldset>
+	
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
+	
+				<field
+					name="item_heading"
+					type="list"
+					default="4"
+					label="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_DESC"
+				>
+					<option value="1">JH1</option>
+					<option value="2">JH2</option>
+					<option value="3">JH3</option>
+					<option value="4">JH4</option>
+					<option value="5">JH5</option>
+				</field>
+	
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					rows="3"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
+	
+				<field
+					name="owncache"
+					type="list"
+					default="1"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+				>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+	
+				<field
+					name="cache_time"
+					type="text"
+					default="900"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+			</fieldset>
+		</fields>
 	</config>
 </extension>
diff --git a/modules/mod_articles_categories/tmpl/default.php b/modules/mod_articles_categories/tmpl/default.php
index ff94bfe850c1a..92c1f9e42585f 100644
--- a/modules/mod_articles_categories/tmpl/default.php
+++ b/modules/mod_articles_categories/tmpl/default.php
@@ -10,6 +10,5 @@
 defined('_JEXEC') or die;
 ?>
 <ul class="categories-module<?php echo $moduleclass_sfx; ?>">
-<?php
-require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default').'_items');
-?></ul>
+<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
+</ul>
diff --git a/modules/mod_articles_categories/tmpl/default_items.php b/modules/mod_articles_categories/tmpl/default_items.php
index dc692f9233286..48ef5b01f2c13 100644
--- a/modules/mod_articles_categories/tmpl/default_items.php
+++ b/modules/mod_articles_categories/tmpl/default_items.php
@@ -9,32 +9,29 @@
 
 defined('_JEXEC') or die;
 
-foreach ($list as $item) :
-
-?>
+foreach ($list as $item) : ?>
 	<li <?php if ($_SERVER['PHP_SELF'] == JRoute::_(ContentHelperRoute::getCategoryRoute($item->id))) echo ' class="active"';?>> <?php $levelup = $item->level - $startLevel - 1; ?>
 		<h<?php echo $params->get('item_heading') + $levelup; ?>>
 		<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id)); ?>">
-		<?php echo $item->title;?><?php if($params->get('numitems')): ?>
-			(<?php echo $item->numitems; ?>)
-		<?php endif; ?></a>
+		<?php echo $item->title;?>
+			<?php if ($params->get('numitems')) : ?>
+				(<?php echo $item->numitems; ?>)
+			<?php endif; ?>
+		</a>
    		</h<?php echo $params->get('item_heading') + $levelup; ?>>
 
-		<?php
-		if ($params->get('show_description', 0))
-		{
-			echo JHtml::_('content.prepare', $item->description, $item->getParams(), 'mod_articles_categories.content');
-		}
-		if ($params->get('show_children', 0) && (($params->get('maxlevel', 0) == 0) || ($params->get('maxlevel') >= ($item->level - $startLevel))) && count($item->getChildren()))
-		{
-
-			echo '<ul>';
-			$temp = $list;
-			$list = $item->getChildren();
-			require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items');
-			$list = $temp;
-			echo '</ul>';
-		}
-		?>
- </li>
+		<?php if ($params->get('show_description', 0)) : ?>
+			<?php echo JHtml::_('content.prepare', $item->description, $item->getParams(), 'mod_articles_categories.content'); ?>
+		<?php endif; ?>
+		<?php if ($params->get('show_children', 0) && (($params->get('maxlevel', 0) == 0)
+			|| ($params->get('maxlevel') >= ($item->level - $startLevel)))
+			&& count($item->getChildren())) : ?>
+			<?php echo '<ul>'; ?>
+			<?php $temp = $list; ?>
+			<?php $list = $item->getChildren(); ?>
+			<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
+			<?php $list = $temp; ?>
+			<?php echo '</ul>'; ?>
+		<?php endif; ?>
+	</li>
 <?php endforeach; ?>
diff --git a/modules/mod_articles_category/helper.php b/modules/mod_articles_category/helper.php
index cb6e81561f718..748386c716648 100644
--- a/modules/mod_articles_category/helper.php
+++ b/modules/mod_articles_category/helper.php
@@ -21,7 +21,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @since       1.6.0
+ * @since       1.6
  */
 abstract class ModArticlesCategoryHelper
 {
@@ -30,7 +30,9 @@ abstract class ModArticlesCategoryHelper
 	 *
 	 * @param   JRegistry  &$params  object holding the models parameters
 	 *
-	 * @return mixed
+	 * @return  mixed
+	 *
+	 * @since  1.6
 	 */
 	public static function getList(&$params)
 	{
@@ -38,7 +40,7 @@ public static function getList(&$params)
 		$articles = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
 
 		// Set application parameters in model
-		$app = JFactory::getApplication();
+		$app       = JFactory::getApplication();
 		$appParams = $app->getParams();
 		$articles->setState('params', $appParams);
 
@@ -48,7 +50,7 @@ public static function getList(&$params)
 		$articles->setState('filter.published', 1);
 
 		// Access filter
-		$access = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
 		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
 		$articles->setState('filter.access', $access);
 
@@ -57,25 +59,25 @@ public static function getList(&$params)
 
 		switch ($mode)
 		{
-			case 'dynamic':
+			case 'dynamic' :
 				$option = $app->input->get('option');
-				$view = $app->input->get('view');
+				$view   = $app->input->get('view');
 
 				if ($option === 'com_content')
 				{
 					switch ($view)
 					{
-						case 'category':
+						case 'category' :
 							$catids = array($app->input->getInt('id'));
 							break;
-						case 'categories':
+						case 'categories' :
 							$catids = array($app->input->getInt('id'));
 							break;
-						case 'article':
+						case 'article' :
 							if ($params->get('show_on_article_page', 1))
 							{
 								$article_id = $app->input->getInt('id');
-								$catid = $app->input->getInt('catid');
+								$catid      = $app->input->getInt('catid');
 
 								if (!$catid)
 								{
@@ -85,8 +87,7 @@ public static function getList(&$params)
 									$article->setState('params', $appParams);
 									$article->setState('filter.published', 1);
 									$article->setState('article.id', (int) $article_id);
-									$item = $article->getItem();
-
+									$item   = $article->getItem();
 									$catids = array($item->catid);
 								}
 								else
@@ -101,7 +102,7 @@ public static function getList(&$params)
 							}
 							break;
 
-						case 'featured':
+						case 'featured' :
 						default:
 							// Return right away if not on the category or article views
 							return;
@@ -115,7 +116,7 @@ public static function getList(&$params)
 
 				break;
 
-			case 'normal':
+			case 'normal' :
 			default:
 				$catids = $params->get('catid');
 				$articles->setState('filter.category_id.include', (bool) $params->get('category_filtering_type', 1));
@@ -140,7 +141,7 @@ public static function getList(&$params)
 				{
 					$categories->setState('filter.parentId', $catid);
 					$recursive = true;
-					$items = $categories->getItems($recursive);
+					$items     = $categories->getItems($recursive);
 
 					if ($items)
 					{
@@ -200,18 +201,18 @@ public static function getList(&$params)
 		$items = $articles->getItems();
 
 		// Display options
-		$show_date = $params->get('show_date', 0);
-		$show_date_field = $params->get('show_date_field', 'created');
+		$show_date        = $params->get('show_date', 0);
+		$show_date_field  = $params->get('show_date_field', 'created');
 		$show_date_format = $params->get('show_date_format', 'Y-m-d H:i:s');
-		$show_category = $params->get('show_category', 0);
-		$show_hits = $params->get('show_hits', 0);
-		$show_author = $params->get('show_author', 0);
-		$show_introtext = $params->get('show_introtext', 0);
-		$introtext_limit = $params->get('introtext_limit', 100);
+		$show_category    = $params->get('show_category', 0);
+		$show_hits        = $params->get('show_hits', 0);
+		$show_author      = $params->get('show_author', 0);
+		$show_introtext   = $params->get('show_introtext', 0);
+		$introtext_limit  = $params->get('introtext_limit', 100);
 
 		// Find current Article ID if on an article page
 		$option = $app->input->get('option');
-		$view = $app->input->get('view');
+		$view   = $app->input->get('view');
 
 		if ($option === 'com_content' && $view === 'article')
 		{
@@ -225,7 +226,7 @@ public static function getList(&$params)
 		// Prepare data for display using display options
 		foreach ($items as &$item)
 		{
-			$item->slug = $item->id . ':' . $item->alias;
+			$item->slug    = $item->id . ':' . $item->alias;
 			$item->catslug = $item->catid ? $item->catid . ':' . $item->category_alias : $item->catid;
 
 			if ($access || in_array($item->access, $authorised))
@@ -235,8 +236,8 @@ public static function getList(&$params)
 			}
 			else
 			{
-				$app  = JFactory::getApplication();
-				$menu = $app->getMenu();
+				$app       = JFactory::getApplication();
+				$menu      = $app->getMenu();
 				$menuitems = $menu->getItems('link', 'index.php?option=com_users&view=login');
 
 				if (isset($menuitems[0]))
@@ -253,8 +254,7 @@ public static function getList(&$params)
 			}
 
 			// Used for styling the active article
-			$item->active = $item->id == $active_article_id ? 'active' : '';
-
+			$item->active      = $item->id == $active_article_id ? 'active' : '';
 			$item->displayDate = '';
 
 			if ($show_date)
@@ -264,7 +264,7 @@ public static function getList(&$params)
 
 			if ($item->catid)
 			{
-				$item->displayCategoryLink = JRoute::_(ContentHelperRoute::getCategoryRoute($item->catid));
+				$item->displayCategoryLink  = JRoute::_(ContentHelperRoute::getCategoryRoute($item->catid));
 				$item->displayCategoryTitle = $show_category ? '<a href="' . $item->displayCategoryLink . '">' . $item->category_title . '</a>' : '';
 			}
 			else
@@ -272,7 +272,7 @@ public static function getList(&$params)
 				$item->displayCategoryTitle = $show_category ? $item->category_title : '';
 			}
 
-			$item->displayHits = $show_hits ? $item->hits : '';
+			$item->displayHits       = $show_hits ? $item->hits : '';
 			$item->displayAuthorName = $show_author ? $item->author : '';
 
 			if ($show_introtext)
@@ -282,7 +282,7 @@ public static function getList(&$params)
 			}
 
 			$item->displayIntrotext = $show_introtext ? self::truncate($item->introtext, $introtext_limit) : '';
-			$item->displayReadmore = $item->alternative_readmore;
+			$item->displayReadmore  = $item->alternative_readmore;
 		}
 
 		return $items;
@@ -294,13 +294,14 @@ public static function getList(&$params)
 	 * @param   string  $introtext  introtext to sanitize
 	 *
 	 * @return mixed|string
+	 *
+	 * @since  1.6
 	 */
 	public static function _cleanIntrotext($introtext)
 	{
 		$introtext = str_replace('<p>', ' ', $introtext);
 		$introtext = str_replace('</p>', ' ', $introtext);
 		$introtext = strip_tags($introtext, '<a><em><strong>');
-
 		$introtext = trim($introtext);
 
 		return $introtext;
@@ -316,6 +317,8 @@ public static function _cleanIntrotext($introtext)
 	 * @param   integer  $maxLength  The maximum number of charactes to render
 	 *
 	 * @return  string  The truncated string
+	 *
+	 * @since   1.6
 	 */
 	public static function truncate($html, $maxLength = 0)
 	{
@@ -361,7 +364,9 @@ public static function truncate($html, $maxLength = 0)
 	 * @param   string  $article_grouping_direction  ordering direction
 	 * @param   null    $fieldNameToKeep             field name to keep
 	 *
-	 * @return array
+	 * @return  array
+	 *
+	 * @since   1.6
 	 */
 	public static function groupBy($list, $fieldName, $article_grouping_direction, $fieldNameToKeep = null)
 	{
@@ -409,7 +414,9 @@ public static function groupBy($list, $fieldName, $article_grouping_direction, $
 	 * @param   string  $article_grouping_direction  ordering direction
 	 * @param   string  $month_year_format           date format to use
 	 *
-	 * @return array
+	 * @return  array
+	 *
+	 * @since   1.6
 	 */
 	public static function groupByDate($list, $type = 'year', $article_grouping_direction, $month_year_format = 'F Y')
 	{
@@ -429,7 +436,7 @@ public static function groupByDate($list, $type = 'year', $article_grouping_dire
 		{
 			switch ($type)
 			{
-				case 'month_year':
+				case 'month_year' :
 					$month_year = JString::substr($item->created, 0, 7);
 
 					if (!isset($grouped[$month_year]))
@@ -440,7 +447,7 @@ public static function groupByDate($list, $type = 'year', $article_grouping_dire
 					$grouped[$month_year][$key] = $item;
 					break;
 
-				case 'year':
+				case 'year' :
 				default:
 					$year = JString::substr($item->created, 0, 4);
 
@@ -462,9 +469,10 @@ public static function groupByDate($list, $type = 'year', $article_grouping_dire
 		{
 			foreach ($grouped as $group => $items)
 			{
-				$date = new JDate($group);
-				$formatted_group = $date->format($month_year_format);
+				$date                      = new JDate($group);
+				$formatted_group           = $date->format($month_year_format);
 				$grouped[$formatted_group] = $items;
+
 				unset($grouped[$group]);
 			}
 		}
diff --git a/modules/mod_articles_category/mod_articles_category.php b/modules/mod_articles_category/mod_articles_category.php
index a04c889f8c931..6133ea52983ba 100644
--- a/modules/mod_articles_category/mod_articles_category.php
+++ b/modules/mod_articles_category/mod_articles_category.php
@@ -14,62 +14,59 @@
 
 $input = JFactory::getApplication()->input;
 
-		// Prep for Normal or Dynamic Modes
-		$mode = $params->get('mode', 'normal');
-		$idbase = null;
+// Prep for Normal or Dynamic Modes
+$mode   = $params->get('mode', 'normal');
+$idbase = null;
 
-		switch ($mode)
-		{
-			case 'dynamic':
-				$option = $input->get('option');
-				$view = $input->get('view');
+switch ($mode)
+{
+	case 'dynamic' :
+		$option = $input->get('option');
+		$view   = $input->get('view');
 
-				if ($option === 'com_content')
-				{
-					switch ($view)
+		if ($option === 'com_content')
+		{
+			switch ($view)
+			{
+				case 'category' :
+					$idbase = $input->getInt('id');
+					break;
+				case 'categories' :
+					$idbase = $input->getInt('id');
+					break;
+				case 'article' :
+					if ($params->get('show_on_article_page', 1))
 					{
-						case 'category':
-							$idbase = $input->getInt('id');
-							break;
-						case 'categories':
-							$idbase = $input->getInt('id');
-							break;
-						case 'article':
-							if ($params->get('show_on_article_page', 1))
-							{
-								$idbase = $input->getInt('catid');
-							}
-							break;
+						$idbase = $input->getInt('catid');
 					}
-				}
-				break;
-			case 'normal':
-			default:
-				$idbase = $params->get('catid');
-				break;
+					break;
+			}
 		}
-
-
+		break;
+	case 'normal' :
+	default:
+		$idbase = $params->get('catid');
+		break;
+}
 
 $cacheid = md5(serialize(array ($idbase, $module->module)));
 
-$cacheparams = new stdClass;
-$cacheparams->cachemode = 'id';
-$cacheparams->class = 'ModArticlesCategoryHelper';
-$cacheparams->method = 'getList';
+$cacheparams               = new stdClass;
+$cacheparams->cachemode    = 'id';
+$cacheparams->class        = 'ModArticlesCategoryHelper';
+$cacheparams->method       = 'getList';
 $cacheparams->methodparams = $params;
-$cacheparams->modeparams = $cacheid;
+$cacheparams->modeparams   = $cacheid;
 
 $list = JModuleHelper::moduleCache($module, $params, $cacheparams);
 
-
 if (!empty($list))
 {
-	$grouped = false;
-	$article_grouping = $params->get('article_grouping', 'none');
+	$grouped                    = false;
+	$article_grouping           = $params->get('article_grouping', 'none');
 	$article_grouping_direction = $params->get('article_grouping_direction', 'ksort');
-	$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));
-	$item_heading = $params->get('item_heading');
+	$moduleclass_sfx            = htmlspecialchars($params->get('moduleclass_sfx'));
+	$item_heading               = $params->get('item_heading');
 
 	if ($article_grouping !== 'none')
 	{
@@ -77,12 +74,12 @@
 
 		switch ($article_grouping)
 		{
-			case 'year':
-			case 'month_year':
+			case 'year' :
+			case 'month_year' :
 				$list = ModArticlesCategoryHelper::groupByDate($list, $article_grouping, $article_grouping_direction, $params->get('month_year_format', 'F Y'));
 				break;
-			case 'author':
-			case 'category_title':
+			case 'author' :
+			case 'category_title' :
 				$list = ModArticlesCategoryHelper::groupBy($list, $article_grouping, $article_grouping_direction);
 				break;
 			default:
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index 78199ce10f51f..7f7c4547d0b07 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -24,21 +24,25 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
-				<field name="mode" type="list" default="normal"
+				<field
+					name="mode"
+					type="list"
+					default="normal"
 					label="MOD_ARTICLES_CATEGORY_FIELD_MODE_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC"
 				>
-					<option value="normal">MOD_ARTICLES_CATEGORY_OPTION_NORMAL_VALUE
-					</option>
-					<option value="dynamic">MOD_ARTICLES_CATEGORY_OPTION_DYNAMIC_VALUE
-					</option>
+					<option value="normal">MOD_ARTICLES_CATEGORY_OPTION_NORMAL_VALUE</option>
+					<option value="dynamic">MOD_ARTICLES_CATEGORY_OPTION_DYNAMIC_VALUE</option>
 				</field>
 			</fieldset>
 
-			<fieldset name="dynamic"
+			<fieldset
+				name="dynamic"
 				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_DYNAMIC_LABEL"
 			>
-				<field name="show_on_article_page" type="radio"
+				<field
+					name="show_on_article_page"
+					type="radio"
 					class="btn-group btn-group-yesno"
 					default="1"
 					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_LABEL"
@@ -49,75 +53,94 @@
 				</field>
 			</fieldset>
 
-			<fieldset name="filtering"
+			<fieldset
+				name="filtering"
 				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_FILTERING_LABEL"
 			>
-				<field name="show_front" type="list" default="show"
+				<field
+					name="show_front"
+					type="list"
+					default="show"
 					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_DESC"
 				>
-					<option value="show">JSHOW
-					</option>
-					<option value="hide">JHIDE
-					</option>
-					<option value="only">MOD_ARTICLES_CATEGORY_OPTION_ONLYFEATURED_VALUE
-					</option>
+					<option value="show">JSHOW</option>
+					<option value="hide">JHIDE</option>
+					<option value="only">MOD_ARTICLES_CATEGORY_OPTION_ONLYFEATURED_VALUE</option>
 				</field>
 
-				<field name="count" type="text" default="0"
+				<field
+					name="count"
+					type="text"
+					default="0"
 					label="MOD_ARTICLES_CATEGORY_FIELD_COUNT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_COUNT_DESC" />
 
-				<field name="filteringspacer1" type="spacer" hr="true" />
+				<field
+					name="filteringspacer1"
+					type="spacer"
+					hr="true" />
 
-				<field name="category_filtering_type" type="list"
+				<field
+					name="category_filtering_type"
+					type="list"
 					default="1"
 					label="MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_DESC"
 				>
-					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE
-					</option>
-					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE
-					</option>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
 				</field>
 
-				<field name="catid" type="category" extension="com_content"
-					multiple="true" size="5"
+				<field
+					name="catid"
+					type="category"
+					extension="com_content"
+					multiple="true"
+					size="5"
 					label="JCATEGORY"
 					description="MOD_ARTICLES_CATEGORY_FIELD_CATEGORY_DESC"
 				>
 					<option value="">JOPTION_ALL_CATEGORIES</option>
 				</field>
 
-				<field name="show_child_category_articles" type="list"
+				<field
+					name="show_child_category_articles"
+					type="list"
 					default="0"
 					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_DESC"
 				>
-					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUDE_VALUE
-					</option>
-					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUDE_VALUE
-					</option>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUDE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUDE_VALUE</option>
 				</field>
 
-				<field name="levels" type="text" default="1"
+				<field
+					name="levels"
+					type="text"
+					default="1"
 					label="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_DESC" />
 
-				<field name="filteringspacer2" type="spacer" hr="true" />
+				<field
+					name="filteringspacer2"
+					type="spacer"
+					hr="true" />
 
-				<field name="author_filtering_type" type="list"
+				<field
+					name="author_filtering_type"
+					type="list"
 					default="1"
 					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_DESC"
 				>
-					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE
-					</option>
-					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE
-					</option>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
 				</field>
 
-				<field name="created_by" type="sql"
+				<field
+					name="created_by"
+					type="sql"
 					multiple="true" size="5"
 					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_DESC"
@@ -127,251 +150,279 @@
 					<option value="">JOPTION_SELECT_AUTHORS</option>
 				</field>
 
-				<field name="filteringspacer3" type="spacer" hr="true" />
+				<field
+					name="filteringspacer3"
+					type="spacer"
+					hr="true" />
 
-				<field name="author_alias_filtering_type" type="list"
+				<field
+					name="author_alias_filtering_type"
+					type="list"
 					default="1"
 					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_DESC"
 				>
-					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE
-					</option>
-					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE
-					</option>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
 				</field>
 
-				<field name="created_by_alias" type="sql"
+				<field
+					name="created_by_alias"
+					type="sql"
 					multiple="true" size="5"
 					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_DESC"
 					query="select distinct(created_by_alias) from #__content where created_by_alias != '' order by created_by_alias ASC"
-					key_field="created_by_alias" value_field="created_by_alias"
+					key_field="created_by_alias"
+					value_field="created_by_alias"
 				>
-					<option value="">JOPTION_SELECT_AUTHOR_ALIASES
-					</option>
+					<option value="">JOPTION_SELECT_AUTHOR_ALIASES</option>
 				</field>
 
-				<field name="filteringspacer4" type="spacer" hr="true" />
+				<field	
+					name="filteringspacer4"
+					type="spacer"
+					hr="true" />
 
-				<field name="excluded_articles" type="textarea"
-					cols="10" rows="3"
+				<field
+					name="excluded_articles"
+					type="textarea"
+					cols="10"
+					rows="3"
 					label="MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_DESC" />
 
-				<field name="filteringspacer5" type="spacer" hr="true" />
+				<field
+					name="filteringspacer5"
+					type="spacer"
+					hr="true" />
 
-				<field name="filteringspacer6" type="spacer" hr="true" />
+				<field
+					name="filteringspacer6"
+					type="spacer"
+					hr="true" />
 
-				<field name="date_filtering" type="list" default="off"
+				<field
+					name="date_filtering"
+					type="list"
+					default="off"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_DESC"
 				>
-					<option value="off">MOD_ARTICLES_CATEGORY_OPTION_OFF_VALUE
-					</option>
-					<option value="range">MOD_ARTICLES_CATEGORY_OPTION_DATERANGE_VALUE
-					</option>
-					<option value="relative">MOD_ARTICLES_CATEGORY_OPTION_RELATIVEDAY_VALUE
-					</option>
+					<option value="off">MOD_ARTICLES_CATEGORY_OPTION_OFF_VALUE</option>
+					<option value="range">MOD_ARTICLES_CATEGORY_OPTION_DATERANGE_VALUE</option>
+					<option value="relative">MOD_ARTICLES_CATEGORY_OPTION_RELATIVEDAY_VALUE</option>
 				</field>
 
-				<field name="date_field" type="list" default="a.created"
+				<field
+					name="date_field"
+					type="list"
+					default="a.created"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_DESC"
 				>
-					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE
-					</option>
-					<option value="a.modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE
-					</option>
-					<option value="a.publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE
-					</option>
+					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="a.modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="a.publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
 				</field>
 
-				<field name="start_date_range" type="calendar"
+				<field
+					name="start_date_range"
+					type="calendar"
 					format="%Y-%m-%d %H:%M:%S"
 					label="MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_DESC"
 					size="22"
 					filter="user_utc" />
 
-				<field name="end_date_range" type="calendar"
+				<field
+					name="end_date_range"
+					type="calendar"
 					format="%Y-%m-%d %H:%M:%S"
 					label="MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_DESC"
 					size="22"
 					filter="user_utc" />
 
-				<field name="relative_date" type="text" default="30"
+				<field
+					name="relative_date"
+					type="text"
+					default="30"
 					label="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_DESC" />
 			</fieldset>
 
-			<fieldset name="ordering"
+			<fieldset
+				name="ordering"
 				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_ORDERING_LABEL"
 			>
-				<field name="article_ordering" type="list"
+				<field
+					name="article_ordering"
+					type="list"
 					default="a.title"
 					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_DESC"
 				>
-					<option value="a.ordering">MOD_ARTICLES_CATEGORY_OPTION_ORDERING_VALUE
-					</option>
-					<option value="fp.ordering">MOD_ARTICLES_CATEGORY_OPTION_ORDERINGFEATURED_VALUE
-					</option>
-					<option value="a.hits">MOD_ARTICLES_CATEGORY_OPTION_HITS_VALUE
-					</option>
-					<option value="a.title">JGLOBAL_TITLE
-					</option>
-					<option value="a.id">MOD_ARTICLES_CATEGORY_OPTION_ID_VALUE
-					</option>
-					<option value="a.alias">JFIELD_ALIAS_LABEL
-					</option>
-					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE
-					</option>
-					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE
-					</option>
-					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE
-					</option>
-					<option value="a.publish_down">MOD_ARTICLES_CATEGORY_OPTION_FINISHPUBLISHING_VALUE
-					</option>
+					<option value="a.ordering">MOD_ARTICLES_CATEGORY_OPTION_ORDERING_VALUE</option>
+					<option value="fp.ordering">MOD_ARTICLES_CATEGORY_OPTION_ORDERINGFEATURED_VALUE</option>
+					<option value="a.hits">MOD_ARTICLES_CATEGORY_OPTION_HITS_VALUE</option>
+					<option value="a.title">JGLOBAL_TITLE</option>
+					<option value="a.id">MOD_ARTICLES_CATEGORY_OPTION_ID_VALUE</option>
+					<option value="a.alias">JFIELD_ALIAS_LABEL</option>
+					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
+					<option value="a.publish_down">MOD_ARTICLES_CATEGORY_OPTION_FINISHPUBLISHING_VALUE</option>
 				</field>
 
-				<field name="article_ordering_direction" type="list"
+				<field
+					name="article_ordering_direction"
+					type="list"
 					default="ASC"
 					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_DESC"
 				>
-					<option value="DESC">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE
-					</option>
-					<option value="ASC">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE
-					</option>
+					<option value="DESC">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE</option>
+					<option value="ASC">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE</option>
 				</field>
 			</fieldset>
 
-			<fieldset name="grouping"
+			<fieldset
+				name="grouping"
 				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_GROUPING_LABEL"
 			>
-				<field name="article_grouping" type="list"
+				<field
+					name="article_grouping"
+					type="list"
 					default="none"
 					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_DESC"
 				>
-					<option value="none">JNONE
-					</option>
-					<option value="year">MOD_ARTICLES_CATEGORY_OPTION_YEAR_VALUE
-					</option>
-					<option value="month_year">MOD_ARTICLES_CATEGORY_OPTION_MONTHYEAR_VALUE
-					</option>
-					<option value="author">JAUTHOR
-					</option>
-					<option value="category_title">JCATEGORY
-					</option>
+					<option value="none">JNONE</option>
+					<option value="year">MOD_ARTICLES_CATEGORY_OPTION_YEAR_VALUE</option>
+					<option value="month_year">MOD_ARTICLES_CATEGORY_OPTION_MONTHYEAR_VALUE</option>
+					<option value="author">JAUTHOR</option>
+					<option value="category_title">JCATEGORY</option>
 				</field>
 
-				<field name="article_grouping_direction" type="list"
+				<field
+					name="article_grouping_direction"
+					type="list"
 					default="ksort"
 					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_DESC"
 				>
-					<option value="krsort">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE
-					</option>
-					<option value="ksort">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE
-					</option>
+					<option value="krsort">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE</option>
+					<option value="ksort">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE</option>
 				</field>
 
-				<field name="month_year_format" type="text"
+				<field
+					name="month_year_format"
+					type="text"
 					default="F Y"
 					label="MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_DESC" />
 			</fieldset>
 
-			<fieldset name="display"
+			<fieldset
+				name="display"
 				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_DISPLAY_LABEL"
 			>
-
-				<field name="link_titles" type="radio" default="1"
+				<field
+					name="link_titles"
+					type="radio"
+					default="1"
 					class="btn-group btn-group-yesno"
 					label="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC"
 				>
-					<option value="1">JYES
-					</option>
-					<option value="0">JNO
-					</option>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
 
-				<field name="show_date" type="radio" default="0"
+				<field
+					name="show_date"
+					type="radio"
+					default="0"
 					class="btn-group btn-group-yesno"
 					label="JDATE"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWDATE_DESC"
 				>
-					<option value="1">JSHOW
-					</option>
-					<option value="0">JHIDE
-					</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
-				<field name="show_date_field" type="list" default="created"
+				<field
+					name="show_date_field"
+					type="list"
+					default="created"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC"
 				>
-					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE
-					</option>
-					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE
-					</option>
-					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE
-					</option>
+					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
 				</field>
 
-				<field name="show_date_format" type="text"
+				<field
+					name="show_date_format"
+					type="text"
 					default="Y-m-d H:i:s"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC" />
 
-				<field name="show_category" type="radio" default="0"
+				<field
+					name="show_category"
+					type="radio"
+					default="0"
 					class="btn-group btn-group-yesno"
 					label="JCATEGORY"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCATEGORY_DESC"
 				>
-					<option value="1">JSHOW
-					</option>
-					<option value="0">JHIDE
-					</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
-				<field name="show_hits" type="radio" default="0"
+				<field
+					name="show_hits"
+					type="radio"
+					default="0"
 					class="btn-group btn-group-yesno"
 					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_DESC"
 				>
-					<option value="1">JSHOW
-					</option>
-					<option value="0">JHIDE
-					</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
-				<field name="show_author" type="radio" default="0"
+				<field
+					name="show_author"
+					type="radio"
+					default="0"
 					class="btn-group btn-group-yesno"
 					label="JAUTHOR"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWAUTHOR_DESC"
 				>
-					<option value="1">JSHOW
-					</option>
-					<option value="0">JHIDE
-					</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
-				<field name="show_introtext" type="radio" default="0"
+				<field
+					name="show_introtext"
+					type="radio"
+					default="0"
 					class="btn-group btn-group-yesno"
 					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_DESC"
 				>
-					<option value="1">JSHOW
-					</option>
-					<option value="0">JHIDE
-					</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
-				<field name="introtext_limit" type="text" default="100"
+				<field
+					name="introtext_limit"
+					type="text"
+					default="100"
 					label="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_DESC" />
 
@@ -383,10 +434,8 @@
 					default="0"
 					class="btn-group btn-group-yesno"
 				>
-					<option value="1">JSHOW
-					</option>
-					<option value="0">JHIDE
-					</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
 				<field
@@ -411,23 +460,38 @@
 
 			</fieldset>
 
-			<fieldset name="advanced">
-				<field name="layout" type="modulelayout"
-					label="JFIELD_ALT_LAYOUT_LABEL" description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
+			<fieldset
+				name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
 
-				<field name="moduleclass_sfx" type="textarea" rows="3"
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					rows="3"
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
 
-				<field name="owncache" type="list" default="1"
-					label="COM_MODULES_FIELD_CACHING_LABEL" description="COM_MODULES_FIELD_CACHING_DESC" >
+				<field
+					name="owncache"
+					type="list"
+					default="1"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+				>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
-					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING
-					</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
 
-				<field name="cache_time" type="text" default="900"
-					label="COM_MODULES_FIELD_CACHE_TIME_LABEL" description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+				<field
+					name="cache_time"
+					type="text"
+					default="900"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 			</fieldset>
 		</fields>
 	</config>
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index 809a01d40311d..cb4d877c3315b 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -11,129 +11,132 @@
 
 ?>
 <ul class="category-module<?php echo $moduleclass_sfx; ?>">
-<?php if ($grouped) : ?>
-	<?php foreach ($list as $group_name => $group) : ?>
-	<li>
-		<ul>
-			<?php foreach ($group as $item) : ?>
-				<li>
-					<?php if ($params->get('link_titles') == 1) : ?>
-						<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
-						<?php echo $item->title; ?>
-						</a>
-					<?php else : ?>
+	<?php if ($grouped) : ?>
+		<?php foreach ($list as $group_name => $group) : ?>
+		<li>
+			<ul>
+				<?php foreach ($group as $item) : ?>
+					<li>
+						<?php if ($params->get('link_titles') == 1) : ?>
+							<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+								<?php echo $item->title; ?>
+							</a>
+						<?php else : ?>
+							<?php echo $item->title; ?>
+						<?php endif; ?>
+	
+						<?php if ($item->displayHits) : ?>
+							<span class="mod-articles-category-hits">
+								(<?php echo $item->displayHits; ?>)
+							</span>
+						<?php endif; ?>
+	
+						<?php if ($params->get('show_author')) : ?>
+							<span class="mod-articles-category-writtenby">
+								<?php echo $item->displayAuthorName; ?>
+							</span>
+						<?php endif;?>
+	
+						<?php if ($item->displayCategoryTitle) : ?>
+							<span class="mod-articles-category-category">
+								(<?php echo $item->displayCategoryTitle; ?>)
+							</span>
+						<?php endif; ?>
+	
+						<?php if ($item->displayDate) : ?>
+							<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
+						<?php endif; ?>
+	
+						<?php if ($params->get('show_introtext')) : ?>
+							<p class="mod-articles-category-introtext">
+								<?php echo $item->displayIntrotext; ?>
+							</p>
+						<?php endif; ?>
+	
+						<?php if ($params->get('show_readmore')) : ?>
+							<p class="mod-articles-category-readmore">
+								<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+									<?php if ($item->params->get('access-view') == false) : ?>
+										<?php echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE'); ?>
+									<?php elseif ($readmore = $item->alternative_readmore) : ?>
+										<?php echo $readmore; ?>
+										<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+											<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
+												<?php echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); ?>
+											<?php endif; ?>
+									<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+										<?php echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE'); ?>
+									<?php else : ?>
+										<?php echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE'); ?>
+										<?php echo JHtml::_('string.truncate', ($item->title), $params->get('readmore_limit')); ?>
+									<?php endif; ?>
+								</a>
+							</p>
+						<?php endif; ?>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		</li>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<?php foreach ($list as $item) : ?>
+			<li>
+				<?php if ($params->get('link_titles') == 1) : ?>
+					<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
 						<?php echo $item->title; ?>
-					<?php endif; ?>
-
-					<?php if ($item->displayHits) : ?>
-						<span class="mod-articles-category-hits">
+					</a>
+				<?php else : ?>
+					<?php echo $item->title; ?>
+				<?php endif; ?>
+	
+				<?php if ($item->displayHits) : ?>
+					<span class="mod-articles-category-hits">
 						(<?php echo $item->displayHits; ?>)
-						</span>
-					<?php endif; ?>
-
-					<?php if ($params->get('show_author')) :?>
-						<span class="mod-articles-category-writtenby">
+					</span>
+				<?php endif; ?>
+	
+				<?php if ($params->get('show_author')) : ?>
+					<span class="mod-articles-category-writtenby">
 						<?php echo $item->displayAuthorName; ?>
-						</span>
-					<?php endif;?>
-
-					<?php if ($item->displayCategoryTitle) :?>
-						<span class="mod-articles-category-category">
+					</span>
+				<?php endif;?>
+	
+				<?php if ($item->displayCategoryTitle) : ?>
+					<span class="mod-articles-category-category">
 						(<?php echo $item->displayCategoryTitle; ?>)
-						</span>
-					<?php endif; ?>
-
-					<?php if ($item->displayDate) : ?>
-						<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
-					<?php endif; ?>
-
-					<?php if ($params->get('show_introtext')) :?>
-						<p class="mod-articles-category-introtext">
-							<?php echo $item->displayIntrotext; ?>
-						</p>
-					<?php endif; ?>
-
-					<?php if ($params->get('show_readmore')) :?>
-						<p class="mod-articles-category-readmore">
+					</span>
+				<?php endif; ?>
+	
+				<?php if ($item->displayDate) : ?>
+					<span class="mod-articles-category-date">
+						<?php echo $item->displayDate; ?>
+					</span>
+				<?php endif; ?>
+	
+				<?php if ($params->get('show_introtext')) : ?>
+					<p class="mod-articles-category-introtext">
+						<?php echo $item->displayIntrotext; ?>
+					</p>
+				<?php endif; ?>
+	
+				<?php if ($params->get('show_readmore')) : ?>
+					<p class="mod-articles-category-readmore">
 						<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
-						<?php if ($item->params->get('access-view') == false) :
-							echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE');
-						elseif ($readmore = $item->alternative_readmore) :
-							echo $readmore;
-							echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit'));
-								if ($params->get('show_readmore_title', 0) != 0) :
-									echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
-									endif;
-						elseif ($params->get('show_readmore_title', 0) == 0) :
-							echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE');
-						else :
-							echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE');
-							echo JHtml::_('string.truncate', ($item->title), $params->get('readmore_limit'));
-						endif; ?>
+							<?php if ($item->params->get('access-view') == false) : ?>
+								<?php echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE'); ?>
+							<?php elseif ($readmore = $item->alternative_readmore) : ?>
+								<?php echo $readmore; ?>
+								<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+							<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+								<?php echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE'); ?>
+							<?php else : ?>
+								<?php echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE'); ?>
+								<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+							<?php endif; ?>
 						</a>
-						</p>
-					<?php endif; ?>
-				</li>
-			<?php endforeach; ?>
-		</ul>
-	</li>
-	<?php endforeach; ?>
-<?php else : ?>
-	<?php foreach ($list as $item) : ?>
-		<li>
-			<?php if ($params->get('link_titles') == 1) : ?>
-				<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
-				<?php echo $item->title; ?>
-				</a>
-			<?php else : ?>
-				<?php echo $item->title; ?>
-			<?php endif; ?>
-
-			<?php if ($item->displayHits) :?>
-				<span class="mod-articles-category-hits">
-				(<?php echo $item->displayHits; ?>)  </span>
-			<?php endif; ?>
-
-			<?php if ($params->get('show_author')) :?>
-				<span class="mod-articles-category-writtenby">
-					<?php echo $item->displayAuthorName; ?>
-				</span>
-			<?php endif;?>
-
-			<?php if ($item->displayCategoryTitle) :?>
-				<span class="mod-articles-category-category">
-				(<?php echo $item->displayCategoryTitle; ?>)
-				</span>
-			<?php endif; ?>
-
-			<?php if ($item->displayDate) : ?>
-				<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
-			<?php endif; ?>
-
-			<?php if ($params->get('show_introtext')) :?>
-				<p class="mod-articles-category-introtext">
-				<?php echo $item->displayIntrotext; ?>
-				</p>
-			<?php endif; ?>
-
-			<?php if ($params->get('show_readmore')) :?>
-				<p class="mod-articles-category-readmore">
-				<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
-					<?php if ($item->params->get('access-view') == false) :
-						echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE');
-					elseif ($readmore = $item->alternative_readmore) :
-						echo $readmore;
-						echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit'));
-					elseif ($params->get('show_readmore_title', 0) == 0) :
-						echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE');
-					else :
-						echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE');
-						echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit'));
-					endif; ?>
-				</a>
-				</p>
-			<?php endif; ?>
-		</li>
-	<?php endforeach; ?>
-<?php endif; ?>
+					</p>
+				<?php endif; ?>
+			</li>
+		<?php endforeach; ?>
+	<?php endif; ?>
 </ul>
diff --git a/modules/mod_articles_latest/helper.php b/modules/mod_articles_latest/helper.php
index e25565ec43b3a..e09aaddc0cec7 100644
--- a/modules/mod_articles_latest/helper.php
+++ b/modules/mod_articles_latest/helper.php
@@ -18,7 +18,7 @@
  *
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
- * @since       1.6.0
+ * @since       1.6
  */
 abstract class ModArticlesLatestHelper
 {
@@ -28,6 +28,8 @@ abstract class ModArticlesLatestHelper
 	 * @param   JRegistry  &$params  module parameters
 	 *
 	 * @return  mixed
+	 *
+	 * @since   1.6
 	 */
 	public static function getList(&$params)
 	{
@@ -38,7 +40,7 @@ public static function getList(&$params)
 		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
 
 		// Set application parameters in model
-		$app = JFactory::getApplication();
+		$app       = JFactory::getApplication();
 		$appParams = $app->getParams();
 		$model->setState('params', $appParams);
 
@@ -48,7 +50,7 @@ public static function getList(&$params)
 		$model->setState('filter.published', 1);
 
 		// Access filter
-		$access = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
 		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
 		$model->setState('filter.access', $access);
 
@@ -60,15 +62,15 @@ public static function getList(&$params)
 
 		switch ($params->get('user_id'))
 		{
-			case 'by_me':
+			case 'by_me' :
 				$model->setState('filter.author_id', (int) $userId);
 				break;
-			case 'not_me':
+			case 'not_me' :
 				$model->setState('filter.author_id', $userId);
 				$model->setState('filter.author_id.include', false);
 				break;
 
-			case '0':
+			case '0' :
 				break;
 
 			default:
@@ -82,13 +84,13 @@ public static function getList(&$params)
 		//  Featured switch
 		switch ($params->get('show_featured'))
 		{
-			case '1':
+			case '1' :
 				$model->setState('filter.featured', 'only');
 				break;
-			case '0':
+			case '0' :
 				$model->setState('filter.featured', 'hide');
 				break;
-			default:
+			default :
 				$model->setState('filter.featured', 'show');
 				break;
 		}
@@ -102,7 +104,7 @@ public static function getList(&$params)
 			'random' => 'RAND()',
 		);
 		$ordering = JArrayHelper::getValue($order_map, $params->get('ordering'), 'a.publish_up');
-		$dir = 'DESC';
+		$dir      = 'DESC';
 
 		$model->setState('list.ordering', $ordering);
 		$model->setState('list.direction', $dir);
@@ -111,7 +113,7 @@ public static function getList(&$params)
 
 		foreach ($items as &$item)
 		{
-			$item->slug = $item->id . ':' . $item->alias;
+			$item->slug    = $item->id . ':' . $item->alias;
 			$item->catslug = $item->catid . ':' . $item->category_alias;
 
 			if ($access || in_array($item->access, $authorised))
diff --git a/modules/mod_articles_latest/mod_articles_latest.php b/modules/mod_articles_latest/mod_articles_latest.php
index 959172a894f92..0cc2e1f7e6b75 100644
--- a/modules/mod_articles_latest/mod_articles_latest.php
+++ b/modules/mod_articles_latest/mod_articles_latest.php
@@ -12,7 +12,7 @@
 // Include the syndicate functions only once
 require_once __DIR__ . '/helper.php';
 
-$list = ModArticlesLatestHelper::getList($params);
+$list            = ModArticlesLatestHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));
 
 require JModuleHelper::getLayoutPath('mod_articles_latest', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index 5b1da12ab7ab9..8258bb1ecfd5d 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension
-	type="module"
-	version="3.1"
-	client="site"
-	method="upgrade">
+<extension type="module" version="3.1" client="site" method="upgrade">
 	<name>mod_articles_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
@@ -28,7 +24,7 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
-			<field
+				<field
 					name="catid"
 					type="category"
 					extension="com_content"
@@ -36,9 +32,11 @@
 					size="10"
 					default=""
 					label="JCATEGORY"
-					description="MOD_LATEST_NEWS_FIELD_CATEGORY_DESC" >
+					description="MOD_LATEST_NEWS_FIELD_CATEGORY_DESC"
+				>
 					<option value="">JOPTION_ALL_CATEGORIES</option>
 				</field>
+
 				<field
 					name="count"
 					type="text"
@@ -51,13 +49,11 @@
 					type="list"
 					default=""
 					label="MOD_LATEST_NEWS_FIELD_FEATURED_LABEL"
-					description="MOD_LATEST_NEWS_FIELD_FEATURED_DESC">
-					<option
-						value="">JSHOW</option>
-					<option
-						value="0">JHIDE</option>
-					<option
-						value="1">MOD_LATEST_NEWS_VALUE_ONLY_SHOW_FEATURED</option>
+					description="MOD_LATEST_NEWS_FIELD_FEATURED_DESC"
+				>
+					<option value="">JSHOW</option>
+					<option value="0">JHIDE</option>
+					<option value="1">MOD_LATEST_NEWS_VALUE_ONLY_SHOW_FEATURED</option>
 				</field>
 
 				<field
@@ -65,17 +61,13 @@
 					type="list"
 					default="published"
 					label="MOD_LATEST_NEWS_FIELD_ORDERING_LABEL"
-					description="MOD_LATEST_NEWS_FIELD_ORDERING_DESC">
-					<option
-						value="c_dsc">MOD_LATEST_NEWS_VALUE_RECENT_ADDED</option>
-					<option
-						value="m_dsc">MOD_LATEST_NEWS_VALUE_RECENT_MODIFIED</option>
-					<option
-						value="p_dsc">MOD_LATEST_NEWS_VALUE_RECENT_PUBLISHED</option>
-					<option
-						value="mc_dsc">MOD_LATEST_NEWS_VALUE_RECENT_TOUCHED</option>
-					<option
-						value="random">MOD_LATEST_NEWS_VALUE_RECENT_RAND</option>
+					description="MOD_LATEST_NEWS_FIELD_ORDERING_DESC"
+				>
+					<option value="c_dsc">MOD_LATEST_NEWS_VALUE_RECENT_ADDED</option>
+					<option value="m_dsc">MOD_LATEST_NEWS_VALUE_RECENT_MODIFIED</option>
+					<option value="p_dsc">MOD_LATEST_NEWS_VALUE_RECENT_PUBLISHED</option>
+					<option value="mc_dsc">MOD_LATEST_NEWS_VALUE_RECENT_TOUCHED</option>
+					<option	value="random">MOD_LATEST_NEWS_VALUE_RECENT_RAND</option>
 				</field>
 
 				<field
@@ -83,20 +75,15 @@
 					type="list"
 					default="0"
 					label="MOD_LATEST_NEWS_FIELD_USER_LABEL"
-					description="MOD_LATEST_NEWS_FIELD_USER_DESC">
-					<option
-						value="0">MOD_LATEST_NEWS_VALUE_ANYONE</option>
-					<option
-						value="by_me">MOD_LATEST_NEWS_VALUE_ADDED_BY_ME</option>
-					<option
-						value="not_me">MOD_LATEST_NEWS_VALUE_NOTADDED_BY_ME</option>
+					description="MOD_LATEST_NEWS_FIELD_USER_DESC"
+				>
+					<option value="0">MOD_LATEST_NEWS_VALUE_ANYONE</option>
+					<option value="by_me">MOD_LATEST_NEWS_VALUE_ADDED_BY_ME</option>
+					<option value="not_me">MOD_LATEST_NEWS_VALUE_NOTADDED_BY_ME</option>
 				</field>
-
 			</fieldset>
 
-			<fieldset
-				name="advanced">
-
+			<fieldset name="advanced">
 				<field
 					name="layout"
 					type="modulelayout"
@@ -114,11 +101,10 @@
 					type="list"
 					default="1"
 					label="COM_MODULES_FIELD_CACHING_LABEL"
-					description="COM_MODULES_FIELD_CACHING_DESC">
-					<option
-						value="1">JGLOBAL_USE_GLOBAL</option>
-					<option
-						value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+					description="COM_MODULES_FIELD_CACHING_DESC"
+				>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
 
 				<field
@@ -127,12 +113,13 @@
 					default="900"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+
 				<field
 					name="cachemode"
 					type="hidden"
-					default="static">
-					<option
-						value="static"></option>
+					default="static"
+				>
+					<option value="static"></option>
 				</field>
 			</fieldset>
 		</fields>
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index da697bb3b0757..3a29e0aefa3c7 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -13,7 +13,10 @@
 <?php foreach ($list as $item) :  ?>
 	<li itemscope itemtype="http://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
-			<span itemprop="name"><?php echo $item->title; ?></span></a>
+			<span itemprop="name">
+				<?php echo $item->title; ?>
+			</span>
+		</a>
 	</li>
 <?php endforeach; ?>
 </ul>
diff --git a/modules/mod_articles_news/helper.php b/modules/mod_articles_news/helper.php
index f098e7ad89b51..b998014037910 100644
--- a/modules/mod_articles_news/helper.php
+++ b/modules/mod_articles_news/helper.php
@@ -19,7 +19,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @since       1.6.0
+ * @since       1.6
  */
 abstract class ModArticlesNewsHelper
 {
@@ -29,6 +29,8 @@ abstract class ModArticlesNewsHelper
 	 * @param   JRegistry  &$params  object holding the models parameters
 	 *
 	 * @return  mixed
+	 *
+	 * @since 1.6
 	 */
 	public static function getList(&$params)
 	{
@@ -52,7 +54,7 @@ public static function getList(&$params)
 			' a.hits, a.featured' );
 
 		// Access filter
-		$access = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
 		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
 		$model->setState('filter.access', $access);
 
@@ -82,18 +84,18 @@ public static function getList(&$params)
 		foreach ($items as &$item)
 		{
 			$item->readmore = strlen(trim($item->fulltext));
-			$item->slug = $item->id . ':' . $item->alias;
-			$item->catslug = $item->catid . ':' . $item->category_alias;
+			$item->slug     = $item->id . ':' . $item->alias;
+			$item->catslug  = $item->catid . ':' . $item->category_alias;
 
 			if ($access || in_array($item->access, $authorised))
 			{
 				// We know that user has the privilege to view the article
-				$item->link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid));
+				$item->link     = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid));
 				$item->linkText = JText::_('MOD_ARTICLES_NEWS_READMORE');
 			}
 			else
 			{
-				$item->link = JRoute::_('index.php?option=com_users&view=login');
+				$item->link     = JRoute::_('index.php?option=com_users&view=login');
 				$item->linkText = JText::_('MOD_ARTICLES_NEWS_READMORE_REGISTER');
 			}
 
@@ -105,10 +107,10 @@ public static function getList(&$params)
 				$item->introtext = preg_replace('/<img[^>]*>/', '', $item->introtext);
 			}
 
-			$results = $app->triggerEvent('onContentAfterDisplay', array('com_content.article', &$item, &$params, 1));
+			$results                 = $app->triggerEvent('onContentAfterDisplay', array('com_content.article', &$item, &$params, 1));
 			$item->afterDisplayTitle = trim(implode("\n", $results));
 
-			$results = $app->triggerEvent('onContentBeforeDisplay', array('com_content.article', &$item, &$params, 1));
+			$results                    = $app->triggerEvent('onContentBeforeDisplay', array('com_content.article', &$item, &$params, 1));
 			$item->beforeDisplayContent = trim(implode("\n", $results));
 		}
 
diff --git a/modules/mod_articles_news/mod_articles_news.php b/modules/mod_articles_news/mod_articles_news.php
index 2a820c5a24660..c1f1bd3836835 100644
--- a/modules/mod_articles_news/mod_articles_news.php
+++ b/modules/mod_articles_news/mod_articles_news.php
@@ -12,7 +12,7 @@
 // Include the syndicate functions only once
 require_once __DIR__ . '/helper.php';
 
-$list = ModArticlesNewsHelper::getList($params);
+$list            = ModArticlesNewsHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));
 
 require JModuleHelper::getLayoutPath('mod_articles_news', $params->get('layout', 'horizontal'));
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index b8e2f859ff770..37b608ba21bfe 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension
-	type="module"
-	version="3.1"
-	client="site"
-	method="upgrade">
+<extension type="module" version="3.1" client="site" method="upgrade">
 	<name>mod_articles_news</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
@@ -36,7 +32,8 @@
 					default=""
 					size="10"
 					label="JCATEGORY"
-					description="MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC" >
+					description="MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC"
+				>
 					<option value="">JOPTION_ALL_CATEGORIES</option>
 				</field>
 
@@ -46,11 +43,10 @@
 					class="btn-group btn-group-yesno"
 					default="0"
 					label="MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL"
-					description="MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC">
-					<option
-						value="1">JYES</option>
-					<option
-						value="0">JNO</option>
+					description="MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC"
+				>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
 
 				<field
@@ -59,11 +55,10 @@
 					type="radio"
 					default="0"
 					label="MOD_ARTICLES_NEWS_FIELD_TITLE_LABEL"
-					description="MOD_ARTICLES_NEWS_FIELD_TITLE_DESC">
-					<option
-						value="1">JYES</option>
-					<option
-						value="0">JNO</option>
+					description="MOD_ARTICLES_NEWS_FIELD_TITLE_DESC"
+				>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
 
 				<field
@@ -71,13 +66,11 @@
 					type="list"
 					class="chzn-color"
 					label="MOD_ARTICLES_NEWS_FIELD_LINKTITLE_LABEL"
-					description="MOD_ARTICLES_NEWS_FIELD_LINKTITLE_DESC">
-					<option
-						value="">JGLOBAL_USE_GLOBAL</option>
-					<option
-						value="0">JNO</option>
-					<option
-						value="1">JYES</option>
+					description="MOD_ARTICLES_NEWS_FIELD_LINKTITLE_DESC"
+				>
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
 				</field>
 
 				<field
@@ -85,17 +78,13 @@
 					type="list"
 					default="h4"
 					label="MOD_ARTICLES_NEWS_TITLE_HEADING"
-					description="MOD_ARTICLES_NEWS_TITLE_HEADING_DESCRIPTION">
-					<option
-						value="h1">JH1</option>
-					<option
-						value="h2">JH2</option>
-					<option
-						value="h3">JH3</option>
-					<option
-						value="h4">JH4</option>
-					<option
-						value="h5">JH5</option>
+					description="MOD_ARTICLES_NEWS_TITLE_HEADING_DESCRIPTION"
+				>
+					<option value="h1">JH1</option>
+					<option value="h2">JH2</option>
+					<option value="h3">JH3</option>
+					<option value="h4">JH4</option>
+					<option value="h5">JH5</option>
 				</field>
 
 				<field
@@ -104,11 +93,10 @@
 					class="btn-group btn-group-yesno"
 					default="1"
 					label="MOD_ARTICLES_NEWS_FIELD_SEPARATOR_LABEL"
-					description="MOD_ARTICLES_NEWS_FIELD_SEPARATOR_DESC">
-					<option
-						value="1">JYES</option>
-					<option
-						value="0">JNO</option>
+					description="MOD_ARTICLES_NEWS_FIELD_SEPARATOR_DESC"
+				>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
 
 				<field
@@ -117,7 +105,8 @@
 					class="btn-group btn-group-yesno"
 					default="0"
 					label="MOD_ARTICLES_NEWS_FIELD_READMORE_LABEL"
-					description="MOD_ARTICLES_NEWS_FIELD_READMORE_DESC">
+					description="MOD_ARTICLES_NEWS_FIELD_READMORE_DESC"
+				>
 					<option value="1">JSHOW</option>
 					<option value="0">JHIDE</option>
 				</field>
@@ -134,17 +123,13 @@
 					type="list"
 					default="a.publish_up"
 					label="MOD_ARTICLES_NEWS_FIELD_ORDERING_LABEL"
-					description="MOD_ARTICLES_NEWS_FIELD_ORDERING_DESC">
-					<option
-						value="a.publish_up">MOD_ARTICLES_NEWS_FIELD_ORDERING_PUBLISHED_DATE</option>
-					<option
-						value="a.created">MOD_ARTICLES_NEWS_FIELD_ORDERING_CREATED_DATE</option>
-					<option
-						value="a.ordering">MOD_ARTICLES_NEWS_FIELD_ORDERING_ORDERING</option>
-					<option
-						value="a.hits">JGLOBAL_HITS</option>
-					<option
-						value="rand()">MOD_ARTICLES_NEWS_FIELD_ORDERING_RANDOM</option>
+					description="MOD_ARTICLES_NEWS_FIELD_ORDERING_DESC"
+				>
+					<option value="a.publish_up">MOD_ARTICLES_NEWS_FIELD_ORDERING_PUBLISHED_DATE</option>
+					<option value="a.created">MOD_ARTICLES_NEWS_FIELD_ORDERING_CREATED_DATE</option>
+					<option value="a.ordering">MOD_ARTICLES_NEWS_FIELD_ORDERING_ORDERING</option>
+					<option value="a.hits">JGLOBAL_HITS</option>
+					<option value="rand()">MOD_ARTICLES_NEWS_FIELD_ORDERING_RANDOM</option>
 				</field>
 
 				<field
@@ -152,18 +137,14 @@
 					type="list"
 					default="1"
 					label="JGLOBAL_ORDER_DIRECTION_LABEL"
-					description="JGLOBAL_ORDER_DIRECTION_DESC">
-					<option
-						value="0">JGLOBAL_ORDER_ASCENDING</option>
-					<option
-						value="1">JGLOBAL_ORDER_DESCENDING</option>
+					description="JGLOBAL_ORDER_DIRECTION_DESC"
+				>
+					<option value="0">JGLOBAL_ORDER_ASCENDING</option>
+					<option value="1">JGLOBAL_ORDER_DESCENDING</option>
 				</field>
-
 			</fieldset>
 
-			<fieldset
-				name="advanced">
-
+			<fieldset name="advanced">
 				<field
 					name="layout"
 					type="modulelayout"
@@ -181,11 +162,10 @@
 					type="list"
 					default="1"
 					label="COM_MODULES_FIELD_CACHING_LABEL"
-					description="COM_MODULES_FIELD_CACHING_DESC">
-					<option
-						value="1">JGLOBAL_USE_GLOBAL</option>
-					<option
-						value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+					description="COM_MODULES_FIELD_CACHING_DESC"
+				>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
 
 				<field
@@ -198,11 +178,10 @@
 				<field
 					name="cachemode"
 					type="hidden"
-					default="itemid">
-					<option
-						value="itemid"></option>
+					default="itemid"
+				>
+					<option value="itemid"></option>
 				</field>
-
 			</fieldset>
 		</fields>
 	</config>
diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php
index 8f9732f167e37..fc2d4c477b55c 100644
--- a/modules/mod_articles_news/tmpl/_item.php
+++ b/modules/mod_articles_news/tmpl/_item.php
@@ -8,14 +8,16 @@
  */
 
 defined('_JEXEC') or die;
+
 $item_heading = $params->get('item_heading', 'h4');
 ?>
 <?php if ($params->get('item_title')) : ?>
 
 	<<?php echo $item_heading; ?> class="newsflash-title<?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php if ($params->get('link_titles') && $item->link != '') : ?>
-		<a href="<?php echo $item->link;?>">
-			<?php echo $item->title;?></a>
+		<a href="<?php echo $item->link; ?>">
+			<?php echo $item->title; ?>
+		</a>
 	<?php else : ?>
 		<?php echo $item->title; ?>
 	<?php endif; ?>
@@ -23,14 +25,14 @@
 
 <?php endif; ?>
 
-<?php if (!$params->get('intro_only')) :
-	echo $item->afterDisplayTitle;
-endif; ?>
+<?php if (!$params->get('intro_only')) : ?>
+	<?php echo $item->afterDisplayTitle; ?>
+<?php endif; ?>
 
 <?php echo $item->beforeDisplayContent; ?>
 
 <?php echo $item->introtext; ?>
 
-<?php if (isset($item->link) && $item->readmore != 0 && $params->get('readmore')) :
-	echo '<a class="readmore" href="'.$item->link.'">'.$item->linkText.'</a>';
-endif; ?>
+<?php if (isset($item->link) && $item->readmore != 0 && $params->get('readmore')) : ?>
+	<?php echo '<a class="readmore" href="' . $item->link . '">' . $item->linkText . '</a>'; ?>
+<?php endif; ?>
diff --git a/modules/mod_articles_news/tmpl/default.php b/modules/mod_articles_news/tmpl/default.php
index 3f49520b3f06d..e620c7555cf55 100644
--- a/modules/mod_articles_news/tmpl/default.php
+++ b/modules/mod_articles_news/tmpl/default.php
@@ -10,9 +10,7 @@
 defined('_JEXEC') or die;
 ?>
 <div class="newsflash<?php echo $moduleclass_sfx; ?>">
-<?php
-foreach ($list as $item) :
-	require JModuleHelper::getLayoutPath('mod_articles_news', '_item');
-endforeach;
-?>
+	<?php foreach ($list as $item) : ?>
+		<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
+	<?php endforeach; ?>
 </div>
diff --git a/modules/mod_articles_news/tmpl/horizontal.php b/modules/mod_articles_news/tmpl/horizontal.php
index ca5b867db6f8a..02a5503000a68 100644
--- a/modules/mod_articles_news/tmpl/horizontal.php
+++ b/modules/mod_articles_news/tmpl/horizontal.php
@@ -9,18 +9,15 @@
 
 defined('_JEXEC') or die;
 ?>
-
 <ul class="newsflash-horiz<?php echo $params->get('moduleclass_sfx'); ?>">
-<?php for ($i = 0, $n = count($list); $i < $n; $i ++) :
-	$item = $list[$i]; ?>
-	<li>
-	<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item');
-
-	if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
-
-	<span class="article-separator">&#160;</span>
+	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
+		<?php $item = $list[$i]; ?>
+		<li>
+			<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
 
-	<?php endif; ?>
-	</li>
-<?php endfor; ?>
+			<?php if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
+				<span class="article-separator">&#160;</span>
+			<?php endif; ?>
+		</li>
+	<?php endfor; ?>
 </ul>
diff --git a/modules/mod_articles_news/tmpl/vertical.php b/modules/mod_articles_news/tmpl/vertical.php
index 19244f587421d..9faabaa352dbb 100644
--- a/modules/mod_articles_news/tmpl/vertical.php
+++ b/modules/mod_articles_news/tmpl/vertical.php
@@ -10,13 +10,14 @@
 defined('_JEXEC') or die;
 ?>
 <ul class="newsflash-vert<?php echo $params->get('moduleclass_sfx'); ?>">
-<?php for ($i = 0, $n = count($list); $i < $n; $i ++) :
-	$item = $list[$i]; ?>
-	<li class="newsflash-item">
-	<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item');
-	if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
-		<span class="article-separator">&#160;</span>
-	<?php endif; ?>
-	</li>
-<?php endfor; ?>
+	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
+		<?php $item = $list[$i]; ?>
+		<li class="newsflash-item">
+			<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
+
+			<?php if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
+				<span class="article-separator">&#160;</span>
+			<?php endif; ?>
+		</li>
+	<?php endfor; ?>
 </ul>
diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php
index de011b676fa22..37dae0b77eeb6 100644
--- a/modules/mod_banners/tmpl/default.php
+++ b/modules/mod_banners/tmpl/default.php
@@ -19,7 +19,7 @@
 
 <?php foreach ($list as $item) : ?>
 	<div class="banneritem">
-		<?php $link = JRoute::_('index.php?option=com_banners&task=click&id='. $item->id);?>
+		<?php $link = JRoute::_('index.php?option=com_banners&task=click&id=' . $item->id);?>
 		<?php if ($item->type == 1) :?>
 			<?php // Text based banners ?>
 			<?php echo str_replace(array('{CLICKURL}', '{NAME}'), array($link, $item->name), $item->custombannercode);?>
@@ -43,12 +43,12 @@
 							<img
 								src="<?php echo $baseurl . $imageurl;?>"
 								alt="<?php echo $alt;?>"
-								<?php if (!empty($width)) echo 'width ="'. $width.'"';?>
-								<?php if (!empty($height)) echo 'height ="'. $height.'"';?>
+								<?php if (!empty($width)) echo 'width ="' . $width . '"';?>
+								<?php if (!empty($height)) echo 'height ="' . $height . '"';?>
 							/>
 						</a>
 					<?php elseif ($target == 2):?>
-						<?php // open in a popup window?>
+						<?php // Open in a popup window?>
 						<a
 							href="<?php echo $link;?>" onclick="window.open(this.href, '',
 								'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550');
@@ -57,12 +57,12 @@
 							<img
 								src="<?php echo $baseurl . $imageurl;?>"
 								alt="<?php echo $alt;?>"
-								<?php if (!empty($width)) echo 'width ="'. $width.'"';?>
-								<?php if (!empty($height)) echo 'height ="'. $height.'"';?>
+								<?php if (!empty($width)) echo 'width ="' . $width . '"';?>
+								<?php if (!empty($height)) echo 'height ="' . $height . '"';?>
 							/>
 						</a>
 					<?php else :?>
-						<?php // open in parent window?>
+						<?php // Open in parent window?>
 						<a
 							href="<?php echo $link;?>"
 							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8');?>">
@@ -87,8 +87,8 @@
 				<object
 					classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
 					codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
-					<?php if (!empty($width)) echo 'width ="'. $width.'"';?>
-					<?php if (!empty($height)) echo 'height ="'. $height.'"';?>
+					<?php if (!empty($width)) echo 'width ="' . $width . '"';?>
+					<?php if (!empty($height)) echo 'height ="' . $height . '"';?>
 				>
 					<param name="movie" value="<?php echo $imageurl;?>" />
 					<embed
@@ -96,8 +96,8 @@ classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
 						loop="false"
 						pluginspage="http://www.macromedia.com/go/get/flashplayer"
 						type="application/x-shockwave-flash"
-						<?php if (!empty($width)) echo 'width ="'. $width.'"';?>
-						<?php if (!empty($height)) echo 'height ="'. $height.'"';?>
+						<?php if (!empty($width)) echo 'width ="' . $width . '"';?>
+						<?php if (!empty($height)) echo 'height ="' . $height . '"';?>
 					/>
 				</object>
 			<?php endif;?>
diff --git a/modules/mod_finder/mod_finder.php b/modules/mod_finder/mod_finder.php
index ea8addc7e4d72..6e62bc7d38ace 100644
--- a/modules/mod_finder/mod_finder.php
+++ b/modules/mod_finder/mod_finder.php
@@ -19,6 +19,7 @@
 {
 	define('FINDER_PATH_INDEXER', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer');
 }
+
 JLoader::register('FinderIndexerQuery', FINDER_PATH_INDEXER . '/query.php');
 
 // Check for OpenSearch
@@ -35,7 +36,6 @@
 						'search', 'rel', array('title' => $ostitle, 'type' => 'application/opensearchdescription+xml')
 					);
 */
-
 }
 
 // Initialize module parameters.
diff --git a/modules/mod_languages/helper.php b/modules/mod_languages/helper.php
index b10cdc443cec8..4a179022fed33 100644
--- a/modules/mod_languages/helper.php
+++ b/modules/mod_languages/helper.php
@@ -57,6 +57,7 @@ public static function getList(&$params)
 			{
 				$associations = MenusHelper::getAssociations($active->id);
 			}
+
 			// Load component associations
 			$option = $app->input->get('option');
 			$eName = JString::ucfirst(JString::str_ireplace('com_', '', $option));
@@ -91,7 +92,8 @@ public static function getList(&$params)
 			{
 				unset($languages[$i]);
 			}
-			else {
+			else
+			{
 				$language->active = $language->lang_code == $lang->getTag();
 
 				if (JLanguageMultilang::isEnabled())
diff --git a/modules/mod_menu/tmpl/default_component.php b/modules/mod_menu/tmpl/default_component.php
index 73b2698ad7893..cea367c06724d 100644
--- a/modules/mod_menu/tmpl/default_component.php
+++ b/modules/mod_menu/tmpl/default_component.php
@@ -35,7 +35,7 @@
 ?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" target="_blank" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
 		break;
 	case 2:
-	// window.open
+	// Use JavaScript "window.open"
 ?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" onclick="window.open(this.href,'targetWindow','toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes');return false;" <?php echo $title; ?>><?php echo $linktype; ?></a>
 <?php
 		break;
diff --git a/modules/mod_menu/tmpl/default_url.php b/modules/mod_menu/tmpl/default_url.php
index 36e118e9e8928..c8e24439e0ac7 100644
--- a/modules/mod_menu/tmpl/default_url.php
+++ b/modules/mod_menu/tmpl/default_url.php
@@ -37,8 +37,8 @@
 ?><a <?php echo $class; ?>href="<?php echo $flink; ?>" target="_blank" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
 		break;
 	case 2:
-		// window.open
-		$options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,'.$params->get('window_open');
+		// Use JavaScript "window.open"
+		$options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open');
 			?><a <?php echo $class; ?>href="<?php echo $flink; ?>" onclick="window.open(this.href,'targetWindow','<?php echo $options;?>');return false;" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
 		break;
 endswitch;
diff --git a/modules/mod_random_image/mod_random_image.php b/modules/mod_random_image/mod_random_image.php
index 65c6d12fd7513..b5cc143aecd57 100644
--- a/modules/mod_random_image/mod_random_image.php
+++ b/modules/mod_random_image/mod_random_image.php
@@ -20,6 +20,7 @@
 if (!count($images))
 {
 	echo JText::_('MOD_RANDOM_IMAGE_NO_IMAGES');
+
 	return;
 }
 
diff --git a/modules/mod_random_image/tmpl/default.php b/modules/mod_random_image/tmpl/default.php
index fa49ea2bb1698..2b2335a3ba2e5 100644
--- a/modules/mod_random_image/tmpl/default.php
+++ b/modules/mod_random_image/tmpl/default.php
@@ -13,7 +13,7 @@
 <?php if ($link) : ?>
 <a href="<?php echo $link; ?>">
 <?php endif; ?>
-	<?php echo JHtml::_('image', $image->folder.'/'.$image->name, $image->name, array('width' => $image->width, 'height' => $image->height)); ?>
+	<?php echo JHtml::_('image', $image->folder . '/' . $image->name, $image->name, array('width' => $image->width, 'height' => $image->height)); ?>
 <?php if ($link) : ?>
 </a>
 <?php endif; ?>
diff --git a/modules/mod_related_items/tmpl/default.php b/modules/mod_related_items/tmpl/default.php
index 5aad4415c91ab..ceb6f6c73142e 100644
--- a/modules/mod_related_items/tmpl/default.php
+++ b/modules/mod_related_items/tmpl/default.php
@@ -13,7 +13,7 @@
 <?php foreach ($list as $item) :	?>
 <li>
 	<a href="<?php echo $item->route; ?>">
-		<?php if ($showDate) echo JHTML::_('date', $item->created, JText::_('DATE_FORMAT_LC4')). " - "; ?>
+		<?php if ($showDate) echo JHTML::_('date', $item->created, JText::_('DATE_FORMAT_LC4')) . " - "; ?>
 		<?php echo $item->title; ?></a>
 </li>
 <?php endforeach; ?>
diff --git a/modules/mod_search/mod_search.php b/modules/mod_search/mod_search.php
index f2e2702ce879b..1caed0320a755 100644
--- a/modules/mod_search/mod_search.php
+++ b/modules/mod_search/mod_search.php
@@ -47,5 +47,6 @@
 {
 	$img = ModSearchHelper::getSearchImage($button_text);
 }
+
 $mitemid = $set_Itemid > 0 ? $set_Itemid : $app->input->get('Itemid');
 require JModuleHelper::getLayoutPath('mod_search', $params->get('layout', 'default'));
diff --git a/modules/mod_syndicate/helper.php b/modules/mod_syndicate/helper.php
index c2a6e2d43f166..3bc49f3a34064 100644
--- a/modules/mod_syndicate/helper.php
+++ b/modules/mod_syndicate/helper.php
@@ -18,6 +18,15 @@
  */
 class ModSyndicateHelper
 {
+	/**
+	 * Gets the link
+	 * 
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 * 
+	 * @return  array  The link as a string
+	 * 
+	 * @since   1.5
+	 */
 	public static function getLink(&$params)
 	{
 		$document = JFactory::getDocument();
@@ -31,6 +40,5 @@ public static function getLink(&$params)
 				return $link;
 			}
 		}
-
 	}
 }
diff --git a/modules/mod_tags_popular/helper.php b/modules/mod_tags_popular/helper.php
index 8862de52b019a..7708c8969ec59 100644
--- a/modules/mod_tags_popular/helper.php
+++ b/modules/mod_tags_popular/helper.php
@@ -88,8 +88,10 @@ public static function getList(&$params)
 
 		// Only return tags connected to published articles
 		$query->where($db->quoteName('c.core_state') . ' = 1')
-			->where('(' . $db->quoteName('c.core_publish_up') . ' = ' . $nullDate . ' OR ' . $db->quoteName('c.core_publish_up') . ' <= ' . $db->quote($nowDate) . ')')
-			->where('(' . $db->quoteName('c.core_publish_down') . ' = ' . $nullDate . ' OR  ' . $db->quoteName('c.core_publish_down') . ' >= ' . $db->quote($nowDate) . ')');
+			->where('(' . $db->quoteName('c.core_publish_up') . ' = ' . $nullDate
+				. ' OR ' . $db->quoteName('c.core_publish_up') . ' <= ' . $db->quote($nowDate) . ')')
+			->where('(' . $db->quoteName('c.core_publish_down') . ' = ' . $nullDate
+				. ' OR  ' . $db->quoteName('c.core_publish_down') . ' >= ' . $db->quote($nowDate) . ')');
 		$db->setQuery($query, 0, $maximum);
 		$results = $db->loadObjectList();
 
diff --git a/modules/mod_tags_popular/tmpl/cloud.php b/modules/mod_tags_popular/tmpl/cloud.php
index bcbe3ef3c2118..b731c816a2a33 100644
--- a/modules/mod_tags_popular/tmpl/cloud.php
+++ b/modules/mod_tags_popular/tmpl/cloud.php
@@ -43,7 +43,7 @@
 		endif;
 ?>
 		<span class="tag">
-			<a class="tag-name" style="font-size: <?php echo $fontsize.'em'; ?>" href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($item->tag_id . ':' . $item->alias)); ?>">
+			<a class="tag-name" style="font-size: <?php echo $fontsize . 'em'; ?>" href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($item->tag_id . ':' . $item->alias)); ?>">
 				<?php echo htmlspecialchars($item->title); ?></a>
 			<?php if ($display_count) : ?>
 				<span class="tag-count badge badge-info"><?php echo $item->count; ?></span>
diff --git a/modules/mod_tags_similar/helper.php b/modules/mod_tags_similar/helper.php
index 2b92897964bf7..1a9f3388174f0 100644
--- a/modules/mod_tags_similar/helper.php
+++ b/modules/mod_tags_similar/helper.php
@@ -70,7 +70,8 @@ public static function getList(&$params)
 				$db->quoteName('cc.core_title'),
 				$db->quoteName('cc.core_alias'),
 				$db->quoteName('cc.core_catid'),
-				$db->quoteName('cc.core_language')
+				$db->quoteName('cc.core_language'),
+				$db->quoteName('cc.core_params')
 				)
 		);
 
@@ -85,7 +86,8 @@ public static function getList(&$params)
 		$query->where('(cc.core_access IN (' . $groups . ') OR cc.core_access = 0)');
 
 		// Don't show current item
-		$query->where('(' . $db->quoteName('m.content_item_id') . ' <> ' . $id . ' OR ' . $db->quoteName('m.type_alias') . ' <> ' . $db->quote($prefix) . ')');
+		$query->where('(' . $db->quoteName('m.content_item_id') . ' <> ' . $id
+			. ' OR ' . $db->quoteName('m.type_alias') . ' <> ' . $db->quote($prefix) . ')');
 
 		// Only return published tags
 		$query->where($db->quoteName('cc.core_state') . ' = 1 ');
@@ -124,6 +126,8 @@ public static function getList(&$params)
 			$explodedAlias = explode('.', $result->type_alias);
 			$result->link = 'index.php?option=' . $explodedAlias[0] . '&view=' . $explodedAlias[1]
 				. '&id=' . $result->content_item_id . '-' . $result->core_alias;
+
+			$result->core_params = new JRegistry($result->core_params);
 		}
 
 		return $results;
diff --git a/modules/mod_users_latest/helper.php b/modules/mod_users_latest/helper.php
index f5ad4e635e37f..3cc95442ded3c 100644
--- a/modules/mod_users_latest/helper.php
+++ b/modules/mod_users_latest/helper.php
@@ -14,10 +14,20 @@
  *
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
+ *
+ * @since       1.6
  */
 class ModUsersLatestHelper
 {
-	// get users sorted by activation date
+	/**
+	 * Get users sorted by activation date
+	 * 
+	 * @param   \Joomla\Registry\Registry  $params  module parameters
+	 * 
+	 * @return  array  The array of users
+	 * 
+	 * @since   1.6
+	 */
 	public static function getUsers($params)
 	{
 		$db		= JFactory::getDbo();
diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php
index aa8daff8c8150..965586461d7ad 100644
--- a/plugins/authentication/ldap/ldap.php
+++ b/plugins/authentication/ldap/ldap.php
@@ -38,6 +38,9 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		// For JLog
 		$response->type = 'LDAP';
 
+		// Strip null bytes from the password
+		$credentials['password'] = str_replace(chr(0), '', $credentials['password']);
+
 		// LDAP does not like Blank passwords (tries to Anon Bind which is bad)
 		if (empty($credentials['password']))
 		{
diff --git a/plugins/content/emailcloak/emailcloak.php b/plugins/content/emailcloak/emailcloak.php
index be6ee0826c720..b31e82b10e9ea 100644
--- a/plugins/content/emailcloak/emailcloak.php
+++ b/plugins/content/emailcloak/emailcloak.php
@@ -54,8 +54,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 	 */
 	protected function _getPattern ($link, $text)
 	{
-		$pattern = '~(?:<a ([\w "\'=\@\.\-:;]*)href\s*=\s*"mailto:'
-			. $link . '"([\w "\'=\@\.\-:;]*))>' . $text . '</a>~i';
+		$pattern = '~(?:<a ([^>]*)href\s*=\s*"mailto:' . $link . '"([^>]*))>' . $text . '</a>~i';
 
 		return $pattern;
 	}
@@ -231,7 +230,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0];
+			$mailText = $regs[4][0] . addslashes($regs[5][0]) . $regs[6][0];
 
 			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
 
@@ -251,7 +250,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = $regs[4][0];
+			$mailText = addslashes($regs[4][0]);
 
 			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
 
@@ -311,7 +310,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = $regs[4][0] . ($regs[5][0]);
+			$mailText = $regs[4][0] . addslashes($regs[5][0]);
 
 			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
 
@@ -355,7 +354,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0] . $regs[3][0];
-			$mailText = $regs[5][0];
+			$mailText = addslashes($regs[5][0]);
 
 			// Needed for handling of Body parameter
 			$mail = str_replace('&amp;', '&', $mail);
@@ -399,7 +398,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0] . $regs[3][0];
-			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0] . $regs[7][0];
+			$mailText = $regs[4][0] . $regs[5][0] . addslashes($regs[6][0]) . $regs[7][0];
 
 			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
 
@@ -467,7 +466,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[1][0] . $regs[2][0] . $regs[3][0];
-			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0];
+			$mailText = $regs[4][0] . $regs[5][0] . addslashes($regs[6][0]);
 
 			// Needed for handling of Body parameter
 			$mail = str_replace('&amp;', '&', $mail);
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index fb8cf75fc1420..838592235363a 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -221,7 +221,20 @@ public function onInit()
 		$toolbar3_add   = array();
 		$toolbar4_add   = array();
 		$elements       = array();
-		$plugins        = array('autolink', 'lists', 'image', 'charmap', 'print', 'preview', 'anchor', 'pagebreak', 'code', 'save', 'textcolor', 'colorpicker', 'importcss');
+		$plugins        = array(
+			'autolink',
+			'lists',
+			'image',
+			'charmap',
+			'print',
+			'preview',
+			'anchor',
+			'pagebreak',
+			'code',
+			'save',
+			'textcolor',
+			'colorpicker',
+			'importcss');
 		$toolbar1_add[] = 'bold';
 		$toolbar1_add[] = 'italic';
 		$toolbar1_add[] = 'underline';
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 1959966c3d7ad..f014fbfea04fd 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -654,7 +654,11 @@ protected function displayMemoryUsage()
 		$bytes = memory_get_usage();
 
 		return '<span class="label">' . JHtml::_('number.bytes', $bytes) . '</span>'
-			. ' (<span class="label">' . number_format($bytes, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')) . ' ' . JText::_('PLG_DEBUG_BYTES') . '</span>)';
+			. ' (<span class="label">'
+			. number_format($bytes, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'))
+			. ' '
+			. JText::_('PLG_DEBUG_BYTES')
+			. '</span>)';
 	}
 
 	/**
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
index 504e696c6f72b..98d8c15b595dc 100644
--- a/plugins/system/languagefilter/languagefilter.php
+++ b/plugins/system/languagefilter/languagefilter.php
@@ -633,6 +633,13 @@ public function onAfterDispatch()
 					if (isset($cassociations[$language->lang_code]))
 					{
 						$link = JRoute::_($cassociations[$language->lang_code] . '&lang=' . $language->sef);
+
+						// Check if language is the default site language and remove url language code is on
+						if ($language->sef == self::$default_sef && $this->params->get('remove_default_prefix') == '1')
+						{
+							$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
+						}
+
 						$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 					}
 					elseif (isset($associations[$language->lang_code]))
@@ -650,6 +657,12 @@ public function onAfterDispatch()
 								$link = JRoute::_($item->link . '&Itemid=' . $item->id . '&lang=' . $language->sef);
 							}
 
+							// Check if language is the default site language and remove url language code is on
+							if ($language->sef == self::$default_sef && $this->params->get('remove_default_prefix') == '1')
+							{
+								$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
+							}
+
 							$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 						}
 					}
@@ -678,6 +691,12 @@ public function onAfterDispatch()
 							$link = JRoute::_($item->link . '&Itemid=' . $item->id . '&lang=' . $language->sef);
 						}
 
+						// Check if language is the default site language and remove url language code is on
+						if ($language->sef == self::$default_sef && $this->params->get('remove_default_prefix') == '1')
+						{
+							$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
+						}
+
 						$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 					}
 				}
diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php
index 8a46314cbcc13..bdd093672cbaa 100644
--- a/plugins/system/redirect/redirect.php
+++ b/plugins/system/redirect/redirect.php
@@ -73,6 +73,19 @@ public static function handleError(&$error)
 			$db->setQuery($query, 0, 1);
 			$link = $db->loadObject();
 
+			// If no published redirect was found try with the server-relative URL
+			if (!$link or ($link->published != 1))
+			{
+				$currRel = rawurldecode($uri->toString(array('path', 'query', 'fragment')));
+				$query = $db->getQuery(true)
+					->select($db->quoteName('new_url'))
+					->select($db->quoteName('published'))
+					->from($db->quoteName('#__redirect_links'))
+					->where($db->quoteName('old_url') . ' = ' . $db->quote($currRel));
+				$db->setQuery($query, 0, 1);
+				$link = $db->loadObject();
+			}
+
 			// If a redirect exists and is published, permanently redirect.
 			if ($link and ($link->published == 1))
 			{
diff --git a/plugins/user/profile/fields/tos.php b/plugins/user/profile/fields/tos.php
index 75d3dca09c1ec..def25db72f641 100644
--- a/plugins/user/profile/fields/tos.php
+++ b/plugins/user/profile/fields/tos.php
@@ -78,9 +78,26 @@ protected function getLabel()
 			) . '"';
 		}
 
-		$tosarticle = $this->element['article'] ? (int) $this->element['article'] : 1;
-		$link = '<a class="modal" title="" href="index.php?option=com_content&amp;view=article&amp;layout=modal&amp;id='
-			. $tosarticle . '&amp;tmpl=component" rel="{handler: \'iframe\', size: {x:800, y:500}}">' . $text . '</a>';
+		$tosarticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
+
+		$link = '';
+
+		if ($tosarticle)
+		{
+			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
+
+			$attribs = array();
+			$attribs['class'] = 'modal';
+			$attribs['rel'] = '{handler: \'iframe\', size: {x:800, y:500}}';
+
+			$url = ContentHelperRoute::getArticleRoute($tosarticle);
+
+			$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
+		}
+		else
+		{
+			$link = $text;
+		}
 
 		// Add the label text and closing tag.
 		$label .= '>' . $link . '<span class="star">&#160;*</span></label>';
diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
index 1116edbad2953..a842af8fd1ace 100644
--- a/plugins/user/profile/profile.php
+++ b/plugins/user/profile/profile.php
@@ -51,8 +51,8 @@ public function __construct(& $subject, $config)
 	/**
 	 * Runs on content preparation
 	 *
-	 * @param   string   $context  The context for the data
-	 * @param   integer  $data     The user id
+	 * @param   string  $context  The context for the data
+	 * @param   object  $data     An object containing the data for the form.
 	 *
 	 * @return  boolean
 	 *
diff --git a/templates/system/component.php b/templates/system/component.php
index 7f37260355d80..a376ba8e61c26 100644
--- a/templates/system/component.php
+++ b/templates/system/component.php
@@ -14,11 +14,6 @@
 <head>
 	<jdoc:include type="head" />
 	<link rel="stylesheet" href="<?php echo $this->baseurl; ?>/templates/system/css/general.css" type="text/css" />
-	<link rel="stylesheet" href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
-
-<?php if ($this->direction == 'rtl') : ?>
-	<link rel="stylesheet" href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/template_rtl.css" type="text/css" />
-<?php endif; ?>
 </head>
 <body class="contentpane">
 	<jdoc:include type="message" />
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index e644830517cc5..5607073011ab6 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -19,7 +19,7 @@
 
 // Maximise error reporting.
 ini_set('zend.ze1_compatibility_mode', '0');
-error_reporting(E_ALL & ~E_STRICT);
+error_reporting(E_ALL & ~(E_STRICT|E_USER_DEPRECATED));
 ini_set('display_errors', 1);
 
 /*
diff --git a/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php b/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php
index f83c098092ce5..471ec76ec6c67 100644
--- a/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php
+++ b/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php
@@ -27,7 +27,7 @@ protected function setUp()
 		//$this->object = new JErrorPage;
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$application->input = new JInput(array());
 		$this->user = $this->getMock('Observer', array('get', 'authorise'));
 
diff --git a/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php b/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php
index 86b0ab2af138f..16d328818d112 100644
--- a/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php
+++ b/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php
@@ -86,4 +86,20 @@ public function testDateAdd($date, $interval, $datePart, $expected)
 			$this->equalTo($expected)
 		);
 	}
+
+	/**
+	 * Tests the JDatabaseQuerySqlite::currentTimestamp method.
+	 *
+	 * @return  void
+	 *
+	 * @covers  JDatabaseQuerySqlite::currentTimestamp
+	 * @since   3.4
+	 */
+	public function testCurrentTimestamp()
+	{
+		$this->assertThat(
+			$this->_instance->currentTimestamp(),
+			$this->equalTo('CURRENT_TIMESTAMP')
+		);
+	}
 }
diff --git a/tests/unit/suites/finderIndexer/FinderIndexerTest.php b/tests/unit/suites/finderIndexer/FinderIndexerTest.php
index d225370399801..1f69b7b61b65f 100644
--- a/tests/unit/suites/finderIndexer/FinderIndexerTest.php
+++ b/tests/unit/suites/finderIndexer/FinderIndexerTest.php
@@ -43,7 +43,7 @@ protected function setUp()
 		// Store the factory state so we can mock the necessary objects
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$session     = $this->getMockSession();
 
 		// Set up our mock database
diff --git a/tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php b/tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php
index 25c86bae6595b..3003e864ea759 100644
--- a/tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php
+++ b/tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php
@@ -48,6 +48,14 @@ class JApplicationAdministratorTest extends TestCaseDatabase
 	 */
 	protected $class;
 
+	/**
+	 * Backup of the SERVER superglobal
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected $backupServer;
+
 	/**
 	 * Data for fetchConfigurationData method.
 	 *
@@ -75,6 +83,14 @@ public function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
+		JFactory::$document = $this->getMockDocument();
+		JFactory::$language = $this->getMockLanguage();
+		JFactory::$session  = $this->getMockSession();
+
+		$this->backupServer = $_SERVER;
+
 		$_SERVER['HTTP_HOST'] = self::TEST_HTTP_HOST;
 		$_SERVER['HTTP_USER_AGENT'] = self::TEST_USER_AGENT;
 		$_SERVER['REQUEST_URI'] = self::TEST_REQUEST_URI;
@@ -87,12 +103,6 @@ public function setUp()
 		// Get a new JApplicationAdministrator instance.
 		$this->class = new JApplicationAdministrator(null, $config);
 		TestReflection::setValue('JApplicationCms', 'instances', array('administrator' => $this->class));
-
-		// We are coupled to Document and Language in JFactory.
-		$this->saveFactoryState();
-
-		JFactory::$document = $this->getMockDocument();
-		JFactory::$language = $this->getMockLanguage();
 	}
 
 	/**
@@ -109,6 +119,8 @@ protected function tearDown()
 		TestReflection::setValue('JEventDispatcher', 'instance', null);
 		TestReflection::setValue('JApplicationCms', 'instances', array());
 
+		$_SERVER = $this->backupServer;
+
 		$this->restoreFactoryState();
 
 		parent::tearDown();
diff --git a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
index 0edc5f6d7ebd8..c1d3f8cad4bd5 100644
--- a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
+++ b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
@@ -50,6 +50,14 @@ class JApplicationCmsTest extends TestCaseDatabase
 	 */
 	protected $class;
 
+	/**
+	 * Backup of the SERVER superglobal
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected $backupServer;
+
 	/**
 	 * Data for fetchConfigurationData method.
 	 *
@@ -77,6 +85,14 @@ public function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
+		JFactory::$document = $this->getMockDocument();
+		JFactory::$language = $this->getMockLanguage();
+		JFactory::$session  = $this->getMockSession();
+
+		$this->backupServer = $_SERVER;
+
 		$_SERVER['HTTP_HOST'] = self::TEST_HTTP_HOST;
 		$_SERVER['HTTP_USER_AGENT'] = self::TEST_USER_AGENT;
 		$_SERVER['REQUEST_URI'] = self::TEST_REQUEST_URI;
@@ -88,12 +104,6 @@ public function setUp()
 
 		// Get a new JApplicationCmsInspector instance.
 		$this->class = new JApplicationCmsInspector(null, $config);
-
-		// We are coupled to Document and Language in JFactory.
-		$this->saveFactoryState();
-
-		JFactory::$document = $this->getMockDocument();
-		JFactory::$language = $this->getMockLanguage();
 	}
 
 	/**
@@ -113,6 +123,8 @@ protected function tearDown()
 		JApplicationCmsInspector::$headersSent = false;
 		JApplicationCmsInspector::$connectionAlive = true;
 
+		$_SERVER = $this->backupServer;
+
 		$this->restoreFactoryState();
 
 		parent::tearDown();
diff --git a/tests/unit/suites/libraries/cms/application/JApplicationSiteTest.php b/tests/unit/suites/libraries/cms/application/JApplicationSiteTest.php
index 42aaa66713921..09496c3f30a9c 100644
--- a/tests/unit/suites/libraries/cms/application/JApplicationSiteTest.php
+++ b/tests/unit/suites/libraries/cms/application/JApplicationSiteTest.php
@@ -48,6 +48,14 @@ class JApplicationSiteTest extends TestCaseDatabase
 	 */
 	protected $class;
 
+	/**
+	 * Backup of the SERVER superglobal
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected $backupServer;
+
 	/**
 	 * Data for fetchConfigurationData method.
 	 *
@@ -75,6 +83,14 @@ public function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
+		JFactory::$document = $this->getMockDocument();
+		JFactory::$language = $this->getMockLanguage();
+		JFactory::$session  = $this->getMockSession();
+
+		$this->backupServer = $_SERVER;
+
 		$_SERVER['HTTP_HOST'] = self::TEST_HTTP_HOST;
 		$_SERVER['HTTP_USER_AGENT'] = self::TEST_USER_AGENT;
 		$_SERVER['REQUEST_URI'] = self::TEST_REQUEST_URI;
@@ -87,12 +103,6 @@ public function setUp()
 		// Get a new JApplicationSite instance.
 		$this->class = new JApplicationSite(null, $config);
 		TestReflection::setValue('JApplicationCms', 'instances', array('site' => $this->class));
-
-		// We are coupled to Document and Language in JFactory.
-		$this->saveFactoryState();
-
-		JFactory::$document = $this->getMockDocument();
-		//JFactory::$language = $this->getMockLanguage();
 	}
 
 	/**
@@ -109,6 +119,8 @@ protected function tearDown()
 		TestReflection::setValue('JEventDispatcher', 'instance', null);
 		TestReflection::setValue('JApplicationCms', 'instances', array());
 
+		$_SERVER = $this->backupServer;
+
 		$this->restoreFactoryState();
 
 		parent::tearDown();
diff --git a/tests/unit/suites/libraries/cms/help/JHelpTest.php b/tests/unit/suites/libraries/cms/help/JHelpTest.php
index b350702f41e61..c297927c734f2 100644
--- a/tests/unit/suites/libraries/cms/help/JHelpTest.php
+++ b/tests/unit/suites/libraries/cms/help/JHelpTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 		// Store the factory state so we can mock the necessary objects
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$config      = $this->getMockConfig();
 		JFactory::$session     = $this->getMockSession();
 
diff --git a/tests/unit/suites/libraries/cms/helper/JHelperContentTest.php b/tests/unit/suites/libraries/cms/helper/JHelperContentTest.php
index f7978296de015..288757eda94bc 100644
--- a/tests/unit/suites/libraries/cms/helper/JHelperContentTest.php
+++ b/tests/unit/suites/libraries/cms/helper/JHelperContentTest.php
@@ -51,8 +51,19 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
 		$this->object = new JHelperContent;
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
+	}
+
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 */
+	protected function tearDown()
+	{
+		$this->restoreFactoryState();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/helper/JHelperContenthistoryTest.php b/tests/unit/suites/libraries/cms/helper/JHelperContenthistoryTest.php
index 22f19b619c258..663c17e4eab73 100644
--- a/tests/unit/suites/libraries/cms/helper/JHelperContenthistoryTest.php
+++ b/tests/unit/suites/libraries/cms/helper/JHelperContenthistoryTest.php
@@ -34,8 +34,19 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
 		$this->object = new JHelperContenthistory;
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
+	}
+
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 */
+	protected function tearDown()
+	{
+		$this->restoreFactoryState();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/helper/JHelperMediaTest.php b/tests/unit/suites/libraries/cms/helper/JHelperMediaTest.php
index 84c836320bf6e..8018c321ad11c 100644
--- a/tests/unit/suites/libraries/cms/helper/JHelperMediaTest.php
+++ b/tests/unit/suites/libraries/cms/helper/JHelperMediaTest.php
@@ -38,7 +38,8 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$session     = $this->getMockSession();
 
 		$this->object = new JHelperMedia;
 	}
diff --git a/tests/unit/suites/libraries/cms/helper/JHelperTagsTest.php b/tests/unit/suites/libraries/cms/helper/JHelperTagsTest.php
index b2fa0d1aba046..e1b14254b64f9 100644
--- a/tests/unit/suites/libraries/cms/helper/JHelperTagsTest.php
+++ b/tests/unit/suites/libraries/cms/helper/JHelperTagsTest.php
@@ -34,9 +34,21 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
 		$this->object = new JHelperTags;
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 	}
+
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 */
+	protected function tearDown()
+	{
+		$this->restoreFactoryState();
+	}
+
 	/**
 	 * Gets the data set to be loaded into the database during setup
 	 *
diff --git a/tests/unit/suites/libraries/cms/helper/JHelperTest.php b/tests/unit/suites/libraries/cms/helper/JHelperTest.php
index 87056ab9fef09..e716b9f5e0d88 100644
--- a/tests/unit/suites/libraries/cms/helper/JHelperTest.php
+++ b/tests/unit/suites/libraries/cms/helper/JHelperTest.php
@@ -51,8 +51,19 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
 		$this->object = new JHelper;
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
+	}
+
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 */
+	protected function tearDown()
+	{
+		$this->restoreFactoryState();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBatchTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBatchTest.php
index 41333fd60d71f..0bbe4ce172b84 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlBatchTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlBatchTest.php
@@ -38,7 +38,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$language = JLanguage::getInstance('en-GB', false);
 
 		$this->backupServer = $_SERVER;
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
index 5a88fb682f3bc..d03516d0bd5b0 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
@@ -43,7 +43,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$document = $this->getMockDocument();
 
 		$this->backupServer = $_SERVER;
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php
index f3a3e3d95ea66..ebdefa6251125 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php
@@ -42,7 +42,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$document = $this->getMockDocument();
 
 		$this->backupServer = $_SERVER;
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php b/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php
index 2379f0f7e764a..0ed242b54cd86 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlFormbehaviorTest.php
@@ -37,7 +37,7 @@ protected function setUp()
 
 		parent::setUp();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$document = $this->getMockDocument();
 
 		$this->backupServer = $_SERVER;
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php b/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
index b4350754242cd..9ffa9c2d004ff 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
@@ -43,7 +43,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$document = $this->getMockDocument();
 
 		$this->backupServer = $_SERVER;
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlTest.php b/tests/unit/suites/libraries/cms/html/JHtmlTest.php
index 422caab7ad448..3d15f679569c0 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlTest.php
@@ -1506,7 +1506,7 @@ public function testCalendar()
 
 		$cfg = new JObject;
 		JFactory::$session = $this->getMockSession();
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$config = $cfg;
 
 		JFactory::$application->expects($this->any())
diff --git a/tests/unit/suites/libraries/cms/layout/JLayoutFileTest.php b/tests/unit/suites/libraries/cms/layout/JLayoutFileTest.php
index b8dc15b3d16a4..e9ba004bbc7c5 100644
--- a/tests/unit/suites/libraries/cms/layout/JLayoutFileTest.php
+++ b/tests/unit/suites/libraries/cms/layout/JLayoutFileTest.php
@@ -27,7 +27,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->object = new JLayoutFile('joomla.sidebars.submenu');
 	}
diff --git a/tests/unit/suites/libraries/cms/module/JModuleHelperTest.php b/tests/unit/suites/libraries/cms/module/JModuleHelperTest.php
index 6b0c900c324cd..dd374dbb98ef0 100644
--- a/tests/unit/suites/libraries/cms/module/JModuleHelperTest.php
+++ b/tests/unit/suites/libraries/cms/module/JModuleHelperTest.php
@@ -31,6 +31,7 @@ protected function setUp()
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$session     = $this->getMockSession();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
index f2c80df65485e..40bf59ec76615 100644
--- a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
+++ b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
@@ -31,7 +31,7 @@ public function setUp()
 		$this->saveFactoryState();
 
 		JFactory::$language = $this->getMockLanguage();
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/plugin/JPluginHelperTest.php b/tests/unit/suites/libraries/cms/plugin/JPluginHelperTest.php
index d39578519fa35..ad4222ac6079f 100644
--- a/tests/unit/suites/libraries/cms/plugin/JPluginHelperTest.php
+++ b/tests/unit/suites/libraries/cms/plugin/JPluginHelperTest.php
@@ -31,6 +31,7 @@ protected function setUp()
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$session     = $this->getMockSession();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/plugin/JPluginTest.php b/tests/unit/suites/libraries/cms/plugin/JPluginTest.php
index a8779f11cb3b2..7bf59188dfa93 100644
--- a/tests/unit/suites/libraries/cms/plugin/JPluginTest.php
+++ b/tests/unit/suites/libraries/cms/plugin/JPluginTest.php
@@ -32,7 +32,7 @@ protected function setUp()
 	{
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$database    = $this->getMockDatabase();
 	}
 
diff --git a/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php b/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php
index e830b69828be4..68341698d0d75 100644
--- a/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php
+++ b/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php
@@ -55,7 +55,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/cms/toolbar/JToolbarTest.php b/tests/unit/suites/libraries/cms/toolbar/JToolbarTest.php
index 90e20ff447331..1f6954b3e9cde 100644
--- a/tests/unit/suites/libraries/cms/toolbar/JToolbarTest.php
+++ b/tests/unit/suites/libraries/cms/toolbar/JToolbarTest.php
@@ -38,7 +38,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php
index df8118cbf0fd3..7f37dc41c927d 100644
--- a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php
+++ b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php
@@ -55,7 +55,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonHelpTest.php b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonHelpTest.php
index 9340626e85057..f578ea9502c70 100644
--- a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonHelpTest.php
+++ b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonHelpTest.php
@@ -57,7 +57,8 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$session     = $this->getMockSession();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php
index e8de06f3b29ce..b8a9ea2f9d1b9 100644
--- a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php
+++ b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php
@@ -49,7 +49,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/ucm/JUcmTypeTest.php b/tests/unit/suites/libraries/cms/ucm/JUcmTypeTest.php
index da525030d8630..50a7170256a4e 100644
--- a/tests/unit/suites/libraries/cms/ucm/JUcmTypeTest.php
+++ b/tests/unit/suites/libraries/cms/ucm/JUcmTypeTest.php
@@ -36,7 +36,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->object = new JUcmType('com_content.article');
 	}
diff --git a/tests/unit/suites/libraries/joomla/JFactoryTest.php b/tests/unit/suites/libraries/joomla/JFactoryTest.php
index 81e88561e4f18..ac6fccfff44fb 100644
--- a/tests/unit/suites/libraries/joomla/JFactoryTest.php
+++ b/tests/unit/suites/libraries/joomla/JFactoryTest.php
@@ -300,6 +300,8 @@ public function testGetDateUTC2()
 	 */
 	public function testGetUserInstance()
 	{
+		JFactory::$session = $this->getMockSession();
+
 		$this->assertInstanceOf(
 			'JUser',
 			JFactory::getUser(),
diff --git a/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php b/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php
index 2a0546024ea4b..fc835035d7814 100644
--- a/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php
+++ b/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php
@@ -37,6 +37,8 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
 		// Create the class object to be tested.
 		$this->class = new JApplicationBaseInspector;
 	}
@@ -54,6 +56,8 @@ protected function tearDown()
 		// Reset the dispatcher instance.
 		TestReflection::setValue('JEventDispatcher', 'instance', null);
 
+		$this->restoreFactoryState();
+
 		parent::tearDown();
 	}
 
diff --git a/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php b/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
index 533740de8eb9f..9788f22c0a3cc 100644
--- a/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
+++ b/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
@@ -50,6 +50,14 @@ class JApplicationWebTest extends TestCase
 	 */
 	protected $class;
 
+	/**
+	 * Backup of the SERVER superglobal
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected $backupServer;
+
 	/**
 	 * Data for detectRequestUri method.
 	 *
@@ -95,6 +103,13 @@ public function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
+		JFactory::$document = $this->getMockDocument();
+		JFactory::$language = $this->getMockLanguage();
+
+		$this->backupServer = $_SERVER;
+
 		$_SERVER['HTTP_HOST'] = self::TEST_HTTP_HOST;
 		$_SERVER['HTTP_USER_AGENT'] = self::TEST_USER_AGENT;
 		$_SERVER['REQUEST_URI'] = self::TEST_REQUEST_URI;
@@ -102,12 +117,6 @@ public function setUp()
 
 		// Get a new JApplicationWebInspector instance.
 		$this->class = new JApplicationWebInspector;
-
-		// We are only coupled to Document and Language in JFactory.
-		$this->saveFactoryState();
-
-		JFactory::$document = $this->getMockDocument();
-		JFactory::$language = $this->getMockLanguage();
 	}
 
 	/**
@@ -120,8 +129,9 @@ public function setUp()
 	 */
 	protected function tearDown()
 	{
-		// Reset the dispatcher instance.
+		// Reset the dispatcher and session instances.
 		TestReflection::setValue('JEventDispatcher', 'instance', null);
+		TestReflection::setValue('JSession', 'instance', null);
 
 		// Reset some web inspector static settings.
 		JApplicationWebInspector::$headersSent = false;
diff --git a/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php b/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php
index 0d2e267b7690e..c93bb4e0e9414 100644
--- a/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php
+++ b/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-jimport('joomla.cache.cache');
-
 /**
  * Mock classes
  *
@@ -21,7 +19,7 @@
  *
  * @since       11.1
  */
-class JCacheStorageTest_Main extends PHPUnit_Framework_TestCase
+class JCacheStorageTest_Main extends TestCase
 {
 	/**
 	 * Test setUp
@@ -32,9 +30,25 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->saveFactoryState();
+
+		JFactory::$session = $this->getMockSession();
+
 		require_once dirname(__DIR__) . '/controller/JCacheControllerRaw.php';
 	}
 
+	/**
+	 * Overrides the parent tearDown method.
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		$this->restoreFactoryState();
+
+		parent::tearDown();
+	}
+
 	/**
 	 * Test provider
 	 *
diff --git a/tests/unit/suites/libraries/joomla/controller/JControllerAdminTest.php b/tests/unit/suites/libraries/joomla/controller/JControllerAdminTest.php
index 30780e02e069f..9ddb78b77da53 100644
--- a/tests/unit/suites/libraries/joomla/controller/JControllerAdminTest.php
+++ b/tests/unit/suites/libraries/joomla/controller/JControllerAdminTest.php
@@ -32,7 +32,7 @@ protected function setUp()
 	{
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$config = $this->getMockConfig();
 
 		parent::setUp();
diff --git a/tests/unit/suites/libraries/joomla/controller/JControllerFormTest.php b/tests/unit/suites/libraries/joomla/controller/JControllerFormTest.php
index 48f77a9883b4f..229f7f933b9b8 100644
--- a/tests/unit/suites/libraries/joomla/controller/JControllerFormTest.php
+++ b/tests/unit/suites/libraries/joomla/controller/JControllerFormTest.php
@@ -30,7 +30,7 @@ protected function setUp()
 	{
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$config = $this->getMockConfig();
 
 		parent::setUp();
diff --git a/tests/unit/suites/libraries/joomla/controller/JControllerLegacyTest.php b/tests/unit/suites/libraries/joomla/controller/JControllerLegacyTest.php
index 228db1c98106b..35d4c98eca77b 100644
--- a/tests/unit/suites/libraries/joomla/controller/JControllerLegacyTest.php
+++ b/tests/unit/suites/libraries/joomla/controller/JControllerLegacyTest.php
@@ -42,7 +42,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$config = $this->getMockConfig();
 
 		$this->class = new JControllerLegacy;
diff --git a/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php b/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php
index d0feded98f777..7b4509bf4cf6a 100644
--- a/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php
+++ b/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php
@@ -33,8 +33,9 @@ class JDocumentRendererMessageTest extends TestCaseDatabase
 	 */
 	protected function setUp()
 	{
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$document = $this->getMockDocument();
+		JFactory::$session = $this->getMockSession();
 
 		$this->_instance = new JDocumentRendererMessage(JFactory::getDocument());
 
diff --git a/tests/unit/suites/libraries/joomla/form/JFormTest.php b/tests/unit/suites/libraries/joomla/form/JFormTest.php
index 1242b92ca0210..0887d2ee48b80 100644
--- a/tests/unit/suites/libraries/joomla/form/JFormTest.php
+++ b/tests/unit/suites/libraries/joomla/form/JFormTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxTest.php
index 42db611bc928a..446f7276b5b8b 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxesTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxesTest.php
index 4b87775290f69..1b53a47c6d453 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxesTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCheckboxesTest.php
@@ -31,7 +31,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldEmailTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldEmailTest.php
index 332388aa59e5d..f851ac640afde 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldEmailTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldEmailTest.php
@@ -32,7 +32,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldNumberTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldNumberTest.php
index c7264a9756cdd..6b7a028d7fc81 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldNumberTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldNumberTest.php
@@ -42,7 +42,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldPasswordTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldPasswordTest.php
index 696da33ac3091..fef1138f67869 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldPasswordTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldPasswordTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$database    = $this->getMockDatabase();
 
 		$this->backupServer = $_SERVER;
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldRange.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldRange.php
index 84aa9dc83cf90..18658f265f4d4 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldRange.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldRange.php
@@ -42,7 +42,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldSpacerTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldSpacerTest.php
index e2e93adefa46d..980ad29aaa849 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldSpacerTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldSpacerTest.php
@@ -40,7 +40,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTelTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTelTest.php
index df293e662ad46..313b8f04b6ebf 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTelTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTelTest.php
@@ -32,7 +32,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextTest.php
index 80c42ad4d4add..64e0f41bcc15c 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextareaTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextareaTest.php
index 615e28b6b26c0..b1019f4e9d917 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextareaTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldTextareaTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldUrlTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldUrlTest.php
index b3ba1b5f5f5e4..617f848d0af2a 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldUrlTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldUrlTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
 
 		$this->backupServer = $_SERVER;
 
diff --git a/tests/unit/suites/libraries/joomla/google/JGoogleEmbedMapsTest.php b/tests/unit/suites/libraries/joomla/google/JGoogleEmbedMapsTest.php
index 8aa350659011a..bb79e6aa8f0af 100644
--- a/tests/unit/suites/libraries/joomla/google/JGoogleEmbedMapsTest.php
+++ b/tests/unit/suites/libraries/joomla/google/JGoogleEmbedMapsTest.php
@@ -628,18 +628,6 @@ public function testGetHeader()
 		$this->assertContains("<script type='text/javascript' src='http://maps.googleapis.com/maps/api/js?key=123456&sensor=false'>", $header);
 	}
 
-	/**
-	 * Tests the getHeader method without a key
-	 *
-	 * @group	JGoogle
-	 * @expectedException UnexpectedValueException
-	 * @return void
-	 */
-	public function testGetHeaderException()
-	{
-		$this->object->getHeader();
-	}
-
 	/**
 	 * Tests the getBody method
 	 *
diff --git a/tests/unit/suites/libraries/joomla/oauth1/JOAuth1ClientTest.php b/tests/unit/suites/libraries/joomla/oauth1/JOAuth1ClientTest.php
index 88b3d76d5a34c..2157a6dc90b01 100644
--- a/tests/unit/suites/libraries/joomla/oauth1/JOAuth1ClientTest.php
+++ b/tests/unit/suites/libraries/joomla/oauth1/JOAuth1ClientTest.php
@@ -71,6 +71,10 @@ class JOAuth1ClientTest extends TestCase
 	 */
 	protected function setUp()
 	{
+		$this->saveFactoryState();
+
+		JFactory::$session = $this->getMockSession();
+
 		$_SERVER['HTTP_HOST'] = 'example.com';
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0';
 		$_SERVER['REQUEST_URI'] = '/index.php';
@@ -98,7 +102,7 @@ protected function setUp()
 	 */
 	protected function tearDown()
 	{
-		JFactory::$session = null;
+		$this->restoreFactoryState();
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/string/JStringPunycodeTest.php b/tests/unit/suites/libraries/joomla/string/JStringPunycodeTest.php
index 94449604ebc70..2914a8c335f6a 100644
--- a/tests/unit/suites/libraries/joomla/string/JStringPunycodeTest.php
+++ b/tests/unit/suites/libraries/joomla/string/JStringPunycodeTest.php
@@ -81,6 +81,12 @@ public function testUrlToPunycode()
 			'http://xn--au-gr-de-nos-plumes-fzb.fr',
 			'Tests punycode encoding a UTF8 url in French'
 		);
+
+		$this->assertEquals(
+			JStringPunycode::urlToPunycode('http://www.джумла-тест.рф#test'),
+			'http://www.xn----7sblgc4ag8bhcd.xn--p1ai#test',
+			'Tests punycode encoding a UTF8 url in Cyrillic with an anchor (See GitHub #4362)'
+		);
 	}
 
 	/**
@@ -103,6 +109,12 @@ public function testUrlToUTF8()
 			'http://au-gré-de-nos-plumes.fr',
 			'Tests punycode decoding a UTF8 url in French'
 		);
+
+		$this->assertEquals(
+			JStringPunycode::urlToUTF8('http://www.xn----7sblgc4ag8bhcd.xn--p1ai#test'),
+			'http://www.джумла-тест.рф#test',
+			'Tests punycode decoding a UTF8 url in Cyrillic with an anchor (See GitHub #4362)'
+		);
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/table/JTableTest.php b/tests/unit/suites/libraries/joomla/table/JTableTest.php
index e33e5e31b78d5..f0cc6152e9a2f 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableTest.php
@@ -354,7 +354,7 @@ public function testReset()
 	 */
 	public function testBind()
 	{
-		TestReflection::setValue($this->object, 'jsonEncode', array('params'));
+		TestReflection::setValue($this->object, '_jsonEncode', array('params'));
 		$this->object->bind(array('id1' => 25, 'id2' => 50, 'title' => 'My Title', 'params' => array('param1' => 'value1', 'param2' => 25)));
 
 		$this->assertEquals(
diff --git a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
index f0325b1256d26..fbe51778443d8 100644
--- a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
+++ b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
@@ -38,6 +38,20 @@ protected function setUp()
 		$this->saveFactoryState();
 	}
 
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function tearDown()
+	{
+		$this->restoreFactoryState();
+		parent::tearDown();
+	}
+
 	/**
 	 * Gets the data set to be loaded into the database during setup
 	 *
diff --git a/tests/unit/suites/libraries/joomla/user/JUserTest.php b/tests/unit/suites/libraries/joomla/user/JUserTest.php
index 9398d67546333..edf5a74a2624b 100644
--- a/tests/unit/suites/libraries/joomla/user/JUserTest.php
+++ b/tests/unit/suites/libraries/joomla/user/JUserTest.php
@@ -40,7 +40,8 @@ protected function setUp()
 
 		$this->object = new JUser('42');
 
-		JFactory::$application = $this->getMockApplication();
+		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$session     = $this->getMockSession();
 	}
 
 	/**
diff --git a/travisci-phpunit.xml b/travisci-phpunit.xml
index 7105dcaa9b4c8..82ce22dc84bfc 100644
--- a/travisci-phpunit.xml
+++ b/travisci-phpunit.xml
@@ -26,19 +26,4 @@
 			<directory>tests/unit/suites/finderIndexer</directory>
 		</testsuite>
 	</testsuites>
-
-	<logging>
-		<log type="coverage-text" target="php://stdout" lowUpperBound="35" highLowerBound="70" />
-	</logging>
-	<filter>
-		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">libraries/cms</directory>
-			<directory suffix=".php">libraries/joomla</directory>
-			<directory suffix=".php">libraries/legacy</directory>
-			<directory suffix=".php">administrator/components/com_finder/helpers/indexer</directory>
-			<file>administrator/includes/helper.php</file>
-			<file>libraries/loader.php</file>
-			<file>libraries/platform.php</file>
-		</whitelist>
-	</filter>
 </phpunit>