Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ protected function updateManifestCaches()
array('plugin', 'module', 'editors-xtd', 0),
array('plugin', 'stats', 'system', 0),
array('plugin', 'packageinstaller','installer',0),
array('plugin', 'urlfolderinstaller','installer', 0),
array('plugin', 'folderinstaller','installer', 0),
array('plugin', 'urlinstaller','installer', 0),

// Templates
array('template', 'beez3', '', 0),
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'simplepie';
DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'simplepie';
INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 1, 0),
(456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 2, 0),
(457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 3, 0);
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
DELETE FROM "#__extensions" WHERE "type" = "library" AND "element" = "simplepie";
DELETE FROM "#__extensions" WHERE "type" = "library" AND "element" = "simplepie";
INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 1, 0),
(456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 2, 0),
(457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 3, 0);
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
DELETE FROM [#__extensions] WHERE [type] = "library" AND [element] = "simplepie";
DELETE FROM [#__extensions] WHERE [type] = "library" AND [element] = "simplepie";
SET IDENTITY_INSERT #__extensions ON;

INSERT INTO #__extensions ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
SELECT 455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 1, 0
UNION ALL
SELECT 456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 2, 0
UNION ALL
SELECT 457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 3, 0;

SET IDENTITY_INSERT #__extensions OFF;
3 changes: 0 additions & 3 deletions administrator/components/com_installer/models/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ protected function populateState()
$app->setUserState('com_installer.message', '');
$app->setUserState('com_installer.extension_message', '');

// Recall the 'Install from Directory' path.
$path = $app->getUserStateFromRequest($this->_context . '.install_directory', 'install_directory', $app->get('tmp_path'));
$this->setState('install.directory', $path);
parent::populateState();
}

Expand Down
209 changes: 107 additions & 102 deletions administrator/components/com_installer/views/install/tmpl/default.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* @package Joomla.Administrator
* @package Joomla.Administrator
* @subpackage com_installer
*
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

defined('_JEXEC') or die;
Expand All @@ -15,62 +15,62 @@

JFactory::getDocument()->addScriptDeclaration(
'
Joomla.submitbutton4 = function() {
var form = document.getElementById("adminForm");
Joomla.submitbutton4 = function() {
var form = document.getElementById("adminForm");

// do field validation
if (form.install_url.value == "" || form.install_url.value == "http://" || form.install_url.value == "https://") {
alert("' . JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true) . '");
}
else
{
jQuery("#loading").css("display", "block");
form.installtype.value = "url";
form.submit();
}
};
// do field validation
if (form.install_url.value == "" || form.install_url.value == "http://" || form.install_url.value == "https://") {
alert("' . JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true) . '");
}
else
{
jQuery("#loading").css("display", "block");
form.installtype.value = "url";
form.submit();
}
};

Joomla.submitbuttonInstallWebInstaller = function() {
var form = document.getElementById("adminForm");
form.install_url.value = "https://appscdn.joomla.org/webapps/jedapps/webinstaller.xml";
Joomla.submitbutton4();
};
Joomla.submitbuttonInstallWebInstaller = function() {
var form = document.getElementById("adminForm");
form.install_url.value = "https://appscdn.joomla.org/webapps/jedapps/webinstaller.xml";
Joomla.submitbutton4();
};

// Add spindle-wheel for installations:
jQuery(document).ready(function($) {
var outerDiv = $("#installer-install");
$("#loading")
.css("top", outerDiv.position().top - $(window).scrollTop())
.css("left", outerDiv.position().left - $(window).scrollLeft())
.css("width", outerDiv.width())
.css("height", outerDiv.height())
.css("display", "none");
});
'
// Add spindle-wheel for installations:
jQuery(document).ready(function($) {
var outerDiv = $("#installer-install");
$("#loading")
.css("top", outerDiv.position().top - $(window).scrollTop())
.css("left", outerDiv.position().left - $(window).scrollLeft())
.css("width", outerDiv.width())
.css("height", outerDiv.height())
.css("display", "none");
});
'
);

JFactory::getDocument()->addStyleDeclaration(
'
#loading {
background: rgba(255, 255, 255, .8) url(\'' . JHtml::_('image', 'jui/ajax-loader.gif', '', null, true, true) . '\') 50% 15% no-repeat;
position: fixed;
opacity: 0.8;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 80);
filter: alpha(opacity = 80);
margin: -10px -50px 0 -50px;
overflow: hidden;
}
.j-jed-message {
margin-bottom: 40px;
line-height: 2em;
color:#333333;
}
'
#loading {
background: rgba(255, 255, 255, .8) url(\'' . JHtml::_('image', 'jui/ajax-loader.gif', '', null, true, true) . '\') 50% 15% no-repeat;
position: fixed;
opacity: 0.8;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 80);
filter: alpha(opacity = 80);
margin: -10px -50px 0 -50px;
overflow: hidden;
}
.j-jed-message {
margin-bottom: 40px;
line-height: 2em;
color:#333333;
}
'
);

?>
Expand All @@ -91,55 +91,60 @@
</script>

<div id="installer-install" class="clearfix">
<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install'); ?>"
method="post" name="adminForm" id="adminForm" class="form-horizontal">
<?php if (!empty($this->sidebar)) : ?>
<div id="j-sidebar-container" class="span2">
<?php echo $this->sidebar; ?>
</div>
<div id="j-main-container" class="span10">
<?php else : ?>
<div id="j-main-container">
<?php endif; ?>

<!-- Render messages set by extension install scripts here -->
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php elseif ($this->showJedAndWebInstaller) : ?>
<div class="alert alert-info j-jed-message"
style="margin-bottom: 40px; line-height: 2em; color:#333333;">
<?php echo JHtml::_(
'link',
JRoute::_('index.php?option=com_installer&view=discover' . urlencode(base64_encode(JUri::getInstance()))),
'&times;',
'class="close hasTooltip" data-dismiss="alert" title="' . str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')) . '"'
);
?>
<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>
&nbsp;&nbsp;<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
<input class="btn" type="button"
value="<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?>"
onclick="Joomla.submitbuttonInstallWebInstaller()"/>
</div>
<?php endif; ?>

<?php echo JHtml::_('bootstrap.startTabSet', 'myTab'); ?>

<?php JEventDispatcher::getInstance()->trigger('onInstallerViewBeforeFirstTab', array()); ?>
<!-- Extension fieldset of the plugin installer urlFolderInstaller-->
<?php JEventDispatcher::getInstance()->trigger('onInstallerViewAfterLastTab', array()); ?>

<?php if ($this->ftp) : ?>
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'ftp', JText::_('COM_INSTALLER_MSG_DESCFTPTITLE', true)); ?>
<?php echo $this->loadTemplate('ftp'); ?>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php endif; ?>

<input type="hidden" name="type" value=""/>
<input type="hidden" name="installtype" value="upload"/>
<input type="hidden" name="task" value="install.install"/>
<?php echo JHtml::_('form.token'); ?>

<?php echo JHtml::_('bootstrap.endTabSet'); ?>
</form>
<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install'); ?>"
method="post" name="adminForm" id="adminForm" class="form-horizontal">
<?php if (!empty($this->sidebar)) : ?>
<div id="j-sidebar-container" class="span2">
<?php echo $this->sidebar; ?>
</div>
<div id="j-main-container" class="span10">
<?php else : ?>
<div id="j-main-container">
<?php endif; ?>
<!-- Render messages set by extension install scripts here -->
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php elseif ($this->showJedAndWebInstaller) : ?>
<div class="alert alert-info j-jed-message"
style="margin-bottom: 40px; line-height: 2em; color:#333333;">
<?php echo JHtml::_(
'link',
JRoute::_('index.php?option=com_installer&view=discover' . urlencode(base64_encode(JUri::getInstance()))),
'&times;',
'class="close hasTooltip" data-dismiss="alert" title="' . str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')) . '"'
);
?>
<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>
&nbsp;&nbsp;<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
<input class="btn" type="button"
value="<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?>"
onclick="Joomla.submitbuttonInstallWebInstaller()"/>
</div>
<?php endif; ?>
<?php echo JHtml::_('bootstrap.startTabSet', 'myTab'); ?>
<?php // Show installation tabs at the start ?>
<?php $firstTab = JEventDispatcher::getInstance()->trigger('onInstallerViewBeforeFirstTab', array()); ?>
<?php // Show installation tabs ?>
<?php $tabs = JEventDispatcher::getInstance()->trigger('onInstallerAddInstallationTab', array()); ?>
<?php // Show installation tabs at the end ?>
<?php $lastTab = JEventDispatcher::getInstance()->trigger('onInstallerViewAfterLastTab', array()); ?>
<?php $tabs = array_merge($firstTab, $tabs, $lastTab); ?>
<?php if (!$tabs) : ?>
<?php JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND'), 'warning'); ?>
<?php endif; ?>

<?php if ($this->ftp) : ?>
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'ftp', JText::_('COM_INSTALLER_MSG_DESCFTPTITLE', true)); ?>
<?php echo $this->loadTemplate('ftp'); ?>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php endif; ?>

<input type="hidden" name="installtype" value=""/>
<input type="hidden" name="task" value="install.install"/>
<?php echo JHtml::_('form.token'); ?>

<?php echo JHtml::_('bootstrap.endTabSet'); ?>
</div>
</form>
</div>
<div id="loading"></div>
1 change: 1 addition & 0 deletions administrator/language/en-GB/en-GB.com_installer.ini
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ COM_INSTALLER_N_UPDATESITES_UNPUBLISHED_1="%d update site successfully disabled.
COM_INSTALLER_NEW_INSTALL="New Install"
COM_INSTALLER_NEW_VERSION="Available"
COM_INSTALLER_NO_INSTALL_TYPE_FOUND="No Install Type Found"
COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND="No installation plugin has been enabled. At least one must be enabled to be able to use the installer. Go to the <a href='index.php?option=com_plugins&view=plugins&filter[folder]=installer' title="Plugin Manager">Plugin Manager</a> to enable the plugins."
COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED="Failed to download package. Download it and install manually from <a href='%1$s'>%1$s</a>."
COM_INSTALLER_PACKAGE_FILE="Package File"
COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine tune how extensions installation and updates work."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
; Joomla! Project
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

PLG_INSTALLER_FOLDERINSTALLER_TEXT="Install from Folder"
PLG_INSTALLER_FOLDERINSTALLER_BUTTON="Check and Install"
PLG_INSTALLER_FOLDERINSTALLER_NO_INSTALL_PATH="Please enter a Folder."
PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows to install packages from a folder."
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
; Joomla! Project
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

PLG_INSTALLER_FOLDERINSTALLER="Installer - Install from Folder"
PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows to install packages from a folder."
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
; Joomla! Project
; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

PLG_INSTALLER_PACKAGEINSTALLER="Installer - Upload from a Package Zip"
PLG_INSTALLER_PACKAGEINSTALLER_EXTENSION_PACKAGE_FILE="Extension package file"
PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin offers functionality for the 'Package (zip) Upload' tab."
PLG_INSTALLER_PACKAGEINSTALLER_NO_PACKAGE="Please select a package to upload"
PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows to install packages from your local computer."
PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install Joomla Extension"
PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_PACKAGE_FILE="Upload Package File"
PLG_INSTALLER_PACKAGEINSTALLER__UPLOAD_AND_INSTALL="Upload & Install"
PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_AND_INSTALL="Upload & Install"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Joomla! Project
; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

PLG_INSTALLER_PACKAGEINSTALLER="Installer - Upload from a Package Zip"
PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin offers functionality for the 'Package (zip) Upload' tab."
PLG_INSTALLER_PACKAGEINSTALLER="Installer - Install from Upload"
PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows to install packages from your local computer."

This file was deleted.

This file was deleted.

10 changes: 10 additions & 0 deletions administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
; Joomla! Project
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

PLG_INSTALLER_URLINSTALLER_BUTTON="Check and Install"
PLG_INSTALLER_URLINSTALLER_INSTALLER_URLFOLDERINSTALLER="Installer - Install from URL."
PLG_INSTALLER_URLINSTALLER_NO_URL="Please enter a URL."
PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows to install packages from a URL."
PLG_INSTALLER_URLINSTALLER_TEXT="Install from URL"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
; Joomla! Project
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows to install packages from a URL."
PLG_INSTALLER_URLINSTALLER="Installer - Install from URL"
6 changes: 4 additions & 2 deletions administrator/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,10 @@
<filename>en-GB.plg_finder_weblinks.sys.ini</filename>
<filename>en-GB.plg_installer_packageinstaller.ini</filename>
<filename>en-GB.plg_installer_packageinstaller.sys.ini</filename>
<filename>en-GB.plg_installer_urlfolderinstaller.ini</filename>
<filename>en-GB.plg_installer_urlfolderinstaller.sys.ini</filename>
<filename>en-GB.plg_installer_folderinstaller.ini</filename>
<filename>en-GB.plg_installer_folderinstaller.sys.ini</filename>
<filename>en-GB.plg_installer_urlinstaller.ini</filename>
<filename>en-GB.plg_installer_urlinstaller.sys.ini</filename>
<filename>en-GB.plg_installer_webinstaller.ini</filename>
<filename>en-GB.plg_installer_webinstaller.sys.ini</filename>
<filename>en-GB.plg_quickicon_extensionupdate.ini</filename>
Expand Down
Loading