diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index f868e4cbf47f9..9dca887b02a79 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -1082,6 +1082,8 @@ public function deleteUnexistingFiles() '/libraries/joomla/registry/format/json.php', '/libraries/joomla/registry/format/php.php', '/libraries/joomla/registry/format/xml.php', + // Joomla 3.3.1 + '/administrator/templates/isis/html/message.php', // Joomla! 3.4 '/administrator/components/com_tags/helpers/html/index.html', '/administrator/components/com_tags/models/fields/index.html', diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php index 1a676a00d07f8..b5cc9cda94017 100644 --- a/administrator/components/com_config/model/application.php +++ b/administrator/components/com_config/model/application.php @@ -97,6 +97,27 @@ public function save($data) { $app = JFactory::getApplication(); + // Check that we aren't setting wrong database configuration + $options = array( + 'driver' => $data['dbtype'], + 'host' => $data['host'], + 'user' => $data['user'], + 'password' => JFactory::getConfig()->get('password'), + 'database' => $data['db'], + 'prefix' => $data['dbprefix'] + ); + + try + { + $dbc = JDatabaseDriver::getInstance($options)->getVersion(); + } + catch (Exception $e) + { + $app->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_CONNECT'), 'error'); + + return false; + } + // Save the rules if (isset($data['rules'])) { diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php index d47bf4fa7f71c..3658cdfa6aaa3 100644 --- a/administrator/components/com_content/models/article.php +++ b/administrator/components/com_content/models/article.php @@ -444,6 +444,12 @@ protected function loadFormData() } } + // If there are params fieldsets in the form it will fail with a registry object + if (isset($data->params) && $data->params instanceof Registry) + { + $data->params = $data->params->toArray(); + } + $this->preprocessData('com_content.article', $data); return $data; diff --git a/administrator/components/com_installer/views/database/tmpl/default.php b/administrator/components/com_installer/views/database/tmpl/default.php index 00b7cb61795f0..dfb0bfcfec2c8 100644 --- a/administrator/components/com_installer/views/database/tmpl/default.php +++ b/administrator/components/com_installer/views/database/tmpl/default.php @@ -37,7 +37,7 @@
+ diff --git a/administrator/components/com_installer/views/install/tmpl/default.php b/administrator/components/com_installer/views/install/tmpl/default.php index faa9fe04c80ef..cac0da70dd0a5 100644 --- a/administrator/components/com_installer/views/install/tmpl/default.php +++ b/administrator/components/com_installer/views/install/tmpl/default.php @@ -12,6 +12,10 @@ // MooTools is loaded for B/C for extensions generating JavaScript in their install scripts, this call will be removed at 4.0 JHtml::_('behavior.framework', true); JHtml::_('bootstrap.tooltip'); + +JText::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE'); +JText::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY'); +JText::script('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL'); ?> +
-
sidebar)) : ?>
sidebar; ?> @@ -105,80 +117,82 @@
- - showMessage) : ?> - loadTemplate('message'); ?> - showJedAndWebInstaller) : ?> -
- ">× -

  

- -
- + + showMessage) : ?> + loadTemplate('message'); ?> + showJedAndWebInstaller) : ?> +
+ × +

  

+ +
+ - 'upload')); ?> + + 'upload')); ?> - trigger('onInstallerViewBeforeFirstTab', array()); ?> + trigger('onInstallerViewBeforeFirstTab', array()); ?> - -
- -
- -
- + +
+ +
+ +
+ +
-
-
- -
-
- - - -
- -
- -
- +
+
-
-
- -
-
- - - -
- -
- -
- +
+ + + +
+ +
+ +
+ +
-
-
- -
- - - - - trigger('onInstallerViewAfterLastTab', array()); ?> - - ftp) : ?> - - loadTemplate('ftp'); ?> - - - - - - - - - - -
+
+ +
+ + + + +
+ +
+ +
+ +
+
+
+ +
+
+ + + trigger('onInstallerViewAfterLastTab', array()); ?> + + ftp) : ?> + + loadTemplate('ftp'); ?> + + + + + + + + + + +
+
+ \ No newline at end of file diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php index 8d1f55893c56b..7fcba36675a62 100644 --- a/administrator/components/com_joomlaupdate/views/default/view.html.php +++ b/administrator/components/com_joomlaupdate/views/default/view.html.php @@ -40,7 +40,7 @@ public function display($tpl = null) $this->assign('methodSelect', JoomlaupdateHelperSelect::getMethods($ftp['enabled'])); // Set the toolbar information. - JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install'); + JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install'); JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false); // Add toolbar buttons. diff --git a/administrator/components/com_joomlaupdate/views/update/view.html.php b/administrator/components/com_joomlaupdate/views/update/view.html.php index 014be8739430e..34579427fdc7a 100644 --- a/administrator/components/com_joomlaupdate/views/update/view.html.php +++ b/administrator/components/com_joomlaupdate/views/update/view.html.php @@ -31,7 +31,7 @@ public function display($tpl=null) $returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise'; // Set the toolbar information. - JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install'); + JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install'); JToolBarHelper::divider(); JToolBarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE'); diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php index 05fda8d5b819c..fe2d7acaab07b 100644 --- a/administrator/components/com_media/models/list.php +++ b/administrator/components/com_media/models/list.php @@ -116,6 +116,7 @@ public function getList() $images = array (); $folders = array (); $docs = array (); + $videos = array (); $fileList = false; $folderList = false; @@ -187,6 +188,13 @@ public function getList() $images[] = $tmp; break; + // Video + case 'mp4': + $tmp->icon_32 = "media/mime-icon-32/" . $ext . ".png"; + $tmp->icon_16 = "media/mime-icon-16/" . $ext . ".png"; + $videos[] = $tmp; + break; + // Non-image document default: $tmp->icon_32 = "media/mime-icon-32/" . $ext . ".png"; @@ -215,8 +223,22 @@ public function getList() } } - $list = array('folders' => $folders, 'docs' => $docs, 'images' => $images); + $list = array('folders' => $folders, 'docs' => $docs, 'images' => $images, 'videos' => $videos); return $list; } + + /** + * Get the videos on the current folder + * + * @return array + * + * @since 1.5 + */ + public function getVideos() + { + $list = $this->getList(); + + return $list['videos']; + } } diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php index 0c0a14ed8925e..ba58d5ed64c98 100644 --- a/administrator/components/com_media/views/images/tmpl/default.php +++ b/administrator/components/com_media/views/images/tmpl/default.php @@ -14,9 +14,20 @@ // Load tooltip instance without HTML support because we have a HTML tag in the tip JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false)); -$user = JFactory::getUser(); -$input = JFactory::getApplication()->input; +$user = JFactory::getUser(); +$input = JFactory::getApplication()->input; $params = JComponentHelper::getParams('com_media'); +$lang = JFactory::getLanguage(); + +// Include jQuery +JHtml::_('jquery.framework'); +JHtml::_('script', 'media/popup-imagemanager.js', false, true); +JHtml::_('stylesheet', 'media/popup-imagemanager.css', array(), true); + +if ($lang->isRtl()) +{ + JHtml::_('stylesheet', 'media/popup-imagemanager_rtl.css', array(), true); +} JFactory::getDocument()->addScriptDeclaration( " diff --git a/administrator/components/com_media/views/images/view.html.php b/administrator/components/com_media/views/images/view.html.php index ed212a092ba2a..1645c49cc942d 100644 --- a/administrator/components/com_media/views/images/view.html.php +++ b/administrator/components/com_media/views/images/view.html.php @@ -28,17 +28,6 @@ class MediaViewImages extends JViewLegacy public function display($tpl = null) { $config = JComponentHelper::getParams('com_media'); - $lang = JFactory::getLanguage(); - - // Include jQuery - JHtml::_('jquery.framework'); - JHtml::_('script', 'media/popup-imagemanager.js', true, true); - JHtml::_('stylesheet', 'media/popup-imagemanager.css', array(), true); - - if ($lang->isRtl()) - { - JHtml::_('stylesheet', 'media/popup-imagemanager_rtl.css', array(), true); - } /* * Display form for FTP credentials? @@ -46,10 +35,10 @@ public function display($tpl = null) */ $ftp = !JClientHelper::hasCredentials('ftp'); - $this->session = JFactory::getSession(); - $this->config = $config; - $this->state = $this->get('state'); - $this->folderList = $this->get('folderList'); + $this->session = JFactory::getSession(); + $this->config = $config; + $this->state = $this->get('state'); + $this->folderList = $this->get('folderList'); $this->require_ftp = $ftp; parent::display($tpl); diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php index 18eca0bbf5777..9975e40b8ebce 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default.php @@ -8,6 +8,17 @@ */ defined('_JEXEC') or die; + +$lang = JFactory::getLanguage(); + +JHtml::_('stylesheet', 'media/popup-imagelist.css', array(), true); + +if ($lang->isRtl()) +{ + JHtml::_('stylesheet', 'media/popup-imagelist_rtl.css', array(), true); +} + +JFactory::getDocument()->addScriptDeclaration("var ImageManager = window.parent.ImageManager;"); ?> images) > 0 || count($this->folders) > 0) : ?>