Bug fix, code style

joomla · Aug 4, 2017 · 9ccbfcd · 9ccbfcd
1 parent cfa97d1
commit 9ccbfcd
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 47 deletions.
diff --git a/administrator/components/com_installer/Controller/Downloadkeys.php b/administrator/components/com_installer/Controller/Downloadkeys.php
@@ -7,15 +7,18 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Installer\Administrator\Controller;
+
 defined('_JEXEC') or die;
+
 use Joomla\CMS\Controller\Admin;
 use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+
 /**
- * Installer Update Sites Controller
+ * Installer Download Keys Controller
  *
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @since       3.4
+ * @since       __DEPLOY_VERSION__
  */
 class Downloadkeys extends Admin
 {
@@ -27,7 +30,7 @@ class Downloadkeys extends Admin
 	 * @param   CMSApplication       $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
-	 * @since  1.6
+	 * @since  __DEPLOY_VERSION__
 	 * @see    \JControllerLegacy
 	 */
 	public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)

diff --git a/administrator/components/com_installer/Helper/InstallerHelper.php b/administrator/components/com_installer/Helper/InstallerHelper.php
@@ -174,14 +174,12 @@ public static function getStateOptions()
 	 */
 	public static function getInstallationXML($extension)
 	{
+		$path = JPATH_ROOT;
+
 		if ($extension->client_id)
 		{
 			$path = JPATH_ADMINISTRATOR;
 		}
-		else
-		{
-			$path = JPATH_ROOT;
-		}
 
 		switch ($extension->type)
 		{
@@ -221,25 +219,25 @@ public static function getInstallationXML($extension)
 	 */
 	public static function getDownloadKey($extension)
 	{
-		$installXmlFile = getInstallationXML($extension);
+		$installXmlFile = self::getInstallationXML($extension);
 
 		if (!isset($installXmlFile->dlid))
 		{
 			return null;
 		}
 
 		$prefix = (string) $installXmlFile->dlid['prefix'];
-		$sufix = (string) $installXmlFile->dlid['sufix'];
-		$value = substr($extension->extra_query, strlen($prefix));
+		$suffix  = (string) $installXmlFile->dlid['suffix'];
+		$value  = substr($extension->extra_query, strlen($prefix));
 
-		if ($sufix != null)
+		if ($suffix != null)
 		{
-			$value = substr($value, 0, -strlen($sufix));
+			$value = substr($value, 0, -strlen($suffix));
 		}
 
 		$downloadKey = array(
 			'prefix'  => $prefix,
-			'sufix'   => $sufix,
+			'suffix'   => $suffix,
 			'value'   => $value
 		);
 

diff --git a/administrator/components/com_installer/Model/Downloadkey.php b/administrator/components/com_installer/Model/Downloadkey.php
@@ -95,20 +95,18 @@ public function getItem($pk = null)
 					)
 				)
 			)
-			->from('#__update_sites AS s')
-			->innerJoin('#__update_sites_extensions AS se ON (se.update_site_id = s.update_site_id)')
-			->innerJoin('#__extensions AS e ON (e.extension_id = se.extension_id)')
-			->where('s.update_site_id' . ' = ' . $item->update_site_id);
+			->from($db->quoteName('#__update_sites', 's'))
+			->innerJoin($db->quoteName('#__update_sites_extensions', 'se') . ' ON ' . $db->quoteName('se.update_site_id') . ' = ' . $db->quoteName('s.update_site_id'))
+			->innerJoin($db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('se.extension_id'))
+			->where($db->quoteName('s.update_site_id') . ' = ' . $db->quote($item->update_site_id));
 		$db->setQuery($query);
 		$extension = $db->loadObject();
 
 		$downloadKey = InstallerHelper::getDownloadKey($extension);
 
-		$app = \JFactory::getApplication();
-		$app->setUserState('prefix', $downloadKey['prefix']);
-		$app->setUserState('suffix', $downloadKey['dlidsuffix']);
-
 		$item->extra_query = $downloadKey['value'];
+		$item->dlidprefix  = $downloadKey['prefix'];
+		$item->dlidsuffix  = $downloadKey['suffix'];
 
 		return $item;
 	}
@@ -124,11 +122,7 @@ public function getItem($pk = null)
 	 */
 	public function save($data)
 	{
-		$app = \JFactory::getApplication();
-		$prefix = $app->getUserState('prefix');
-		$suffix = $app->getUserState('suffix');
-
-		$data['extra_query'] = $prefix . $data['extra_query'] . $suffix;
+		$data['extra_query'] = $data['dlidprefix'] . $data['extra_query'] . $data['dlidsuffix'];
 
 		return parent::save($data);
 	}

diff --git a/administrator/components/com_installer/Model/Downloadkeys.php b/administrator/components/com_installer/Model/Downloadkeys.php
@@ -120,9 +120,9 @@ protected function getListQuery()
 					'e.manifest_cache',
 				)
 			)
-			->from('#__update_sites AS s')
-			->innerJoin('#__update_sites_extensions AS se ON (se.update_site_id = s.update_site_id)')
-			->innerJoin('#__extensions AS e ON (e.extension_id = se.extension_id)')
+			->from($db->quoteName('#__update_sites', 's'))
+			->innerJoin($db->quoteName('#__update_sites_extensions', 'se') . ' ON ' . $db->quoteName('se.update_site_id') . ' = ' . $db->quoteName('s.update_site_id'))
+			->innerJoin($db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('se.extension_id'))
 			->where('location not like \'%.joomla.org/%\''
 			);
 
@@ -134,30 +134,30 @@ protected function getListQuery()
 
 		if ($enabled != '')
 		{
-			$query->where('s.enabled = ' . (int) $enabled);
+			$query->where($db->quoteName('s.enabled') . ' = ' . $db->quote((int) $enabled));
 		}
 
 		if ($type)
 		{
-			$query->where('e.type = ' . $this->_db->quote($type));
+			$query->where($db->quoteName('e.type') . ' = ' . $db->quote($type));
 		}
 
 		if ($clientId != '')
 		{
-			$query->where('e.client_id = ' . (int) $clientId);
+			$query->where($db->quoteName('e.client_id') . ' = ' . $db->quote((int) $clientId));
 		}
 
 		if ($folder != '' && in_array($type, array('plugin', 'library', '')))
 		{
-			$query->where('e.folder = ' . $this->_db->quote($folder == '*' ? '' : $folder));
+			$query->where($db->quoteName('e.folder') . ' = ' . $db->quote($folder == '*' ? '' : $folder));
 		}
 
 		// Process search filter (update site id).
 		$search = $this->getState('filter.search');
 
 		if (!empty($search) && stripos($search, 'id:') === 0)
 		{
-			$query->where('s.update_site_id = ' . (int) substr($search, 3));
+			$query->where($db->quoteName('s.update_site_id') . ' = ' . $db->quote((int) substr($search, 3)));
 		}
 
 		// Note: The search for name, ordering and pagination are processed by the parent InstallerModel class (in extension.php).

diff --git a/administrator/components/com_installer/Table/Downloadkey.php b/administrator/components/com_installer/Table/Downloadkey.php
@@ -19,7 +19,6 @@
  */
 class Downloadkey extends Table
 {
-
 	/**
 	 * Constructor
 	 *

diff --git a/administrator/components/com_installer/View/Downloadkey/Html.php b/administrator/components/com_installer/View/Downloadkey/Html.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\View\HtmlView;
 
 /**
- * View to edit a contact.
+ * View to edit a download key.
  *
  * @since  __DEPLOY_VERSION__
  */
@@ -52,11 +52,7 @@ public function display($tpl = null)
 		$this->form  = $this->get('Form');
 		$this->item  = $this->get('Item');
 
-		// Inject into form dlid prefix and sufix so can be easier
-		// to load the DownloadKey field if they exist
 		$jinput = \JFactory::getApplication()->input;
-		$this->form->dlidprefix = $jinput->getString('dlidprefix');
-		$this->form->dlidsufix = $jinput->getString('dlidsufix');
 		$this->modal = $jinput->getString('tmpl', '');
 
 		// Check for errors.

diff --git a/administrator/components/com_installer/View/Downloadkeys/Html.php b/administrator/components/com_installer/View/Downloadkeys/Html.php
@@ -7,7 +7,9 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 namespace Joomla\Component\Installer\Administrator\View\Downloadkeys;
+
 defined('_JEXEC') or die;
+
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Installer\Administrator\View\Installer\Html as InstallerViewDefault;

diff --git a/administrator/components/com_installer/forms/downloadkey.xml b/administrator/components/com_installer/forms/downloadkey.xml
@@ -26,5 +26,13 @@
                 class="input-xxlarge"
                 default=""
         />
+        <field
+                name="dlidprefix"
+                type="hidden"
+        />
+        <field
+                name="dlidsuffix"
+                type="hidden"
+        />
     </fieldset>
 </form>
diff --git a/administrator/components/com_modules/View/Module/Html.php b/administrator/components/com_modules/View/Module/Html.php
@@ -160,7 +160,7 @@ protected function addToolbar()
 
 		if (isset($this->item->xml->dlid))
 		{
-			\JToolbarHelper::downloadkey('Download Key', null, $this->item->module);
+			\JToolbarHelper::downloadkey('JGLOBAL_DOWNLOAD_KEY_MODAL_BUTTON', null, $this->item->module);
 		}
 	}
 }
diff --git a/administrator/components/com_plugins/View/Plugin/Html.php b/administrator/components/com_plugins/View/Plugin/Html.php
@@ -114,7 +114,7 @@ protected function addToolbar()
 
 		if (isset($this->item->xml->dlid))
 		{
-			\JToolbarHelper::downloadkey('Download Key', $this->item->extension_id);
+			\JToolbarHelper::downloadkey('JGLOBAL_DOWNLOAD_KEY_MODAL_BUTTON', $this->item->extension_id);
 		}
 	}
 }
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -335,6 +335,8 @@ JGLOBAL_DISPLAY_NUM="Display #"
 JGLOBAL_DISPLAY_SELECT_DESC="Show or hide the Display Select dropdown listbox."
 JGLOBAL_DISPLAY_SELECT_LABEL="Display Select"
 JGLOBAL_DOWN="Down"
+JGLOBAL_DOWNLOAD_KEY_MODAL_BUTTON="Download key"
+JGLOBAL_DOWNLOAD_KEY_MODAL_TITLE="Download key modal"
 JGLOBAL_EDIT_ITEM="Edit item"
 JGLOBAL_EDIT_PREFERENCES="Edit Preferences"
 JGLOBAL_EMAIL="Email"

diff --git a/libraries/src/CMS/Toolbar/ToolbarHelper.php b/libraries/src/CMS/Toolbar/ToolbarHelper.php
@@ -718,7 +718,7 @@ public static function modal($targetModalId, $icon, $alt)
 	}
 
 	/**
-	 * Displays a modal button
+	 * Displays a modal button for the extensions that have a download key
 	 *
 	 * @param   string  $alt          Title for the modal button.
 	 * @param   string  $extensionId  Id of the extension.
@@ -733,9 +733,9 @@ public static function downloadkey($alt, $extensionId, $module = null)
 		$db    = \JFactory::getDbo();
 		$query = $db->getQuery(true)
 			->select($db->quoteName('s.update_site_id'))
-			->from('#__update_sites AS s')
-			->innerJoin('#__update_sites_extensions AS se ON (se.update_site_id = s.update_site_id)')
-			->innerJoin('#__extensions AS e ON (e.extension_id = se.extension_id)');
+			->from($db->quoteName('#__update_sites', 's'))
+			->innerJoin($db->quoteName('#__update_sites_extensions', 'se') . ' ON ' . $db->quoteName('se.update_site_id') . ' = ' . $db->quoteName('s.update_site_id'))
+			->innerJoin($db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('se.extension_id'));
 
 		if ($module == null)
 		{
@@ -761,7 +761,7 @@ public static function downloadkey($alt, $extensionId, $module = null)
 			'bootstrap.renderModal',
 			'download_key_modal',
 			array(
-				'title' => 'Download key modal',
+				'title' => \JText::_('JGLOBAL_DOWNLOAD_KEY_MODAL_TITLE'),
 				'bodyHeight'  => '45',
 				'modalWidth'  => '80',
 				'footer'      => '<a role="button" class="btn btn-secondary" aria-hidden="true"'