CHANGELOG.md

@@ -1,5 +1,10 @@
 # Contao core bundle change log
 
+### 4.4.4 (2017-09-05)
+
+ * Show the form submit buttons at the end of the form instead of at the end of the page.
+ * Do not add the referer ID in the Template::route() method (see #1033). 
+
 ### 4.4.3 (2017-08-16)
 
  * Correctly assign the form CSS ID (see #956).

README.md

@@ -25,7 +25,7 @@ Edit your `composer.json` file and add the following:
 ```json
 "require": {
     "contao/core-bundle": "^4.4"
-}
+},
 "config": {
     "component-dir": "assets"
 },

src/Cache/ContaoCacheWarmer.php

@@ -117,8 +117,13 @@ private function generateConfigCache($cacheDir)
     {
         $dumper = new CombinedFileDumper($this->filesystem, new PhpFileLoader(), $cacheDir.'/contao', true);
 
-        $dumper->dump($this->findConfigFiles('autoload.php'), 'config/autoload.php', ['type' => 'namespaced']);
-        $dumper->dump($this->findConfigFiles('config.php'), 'config/config.php', ['type' => 'namespaced']);
+        foreach (['autoload.php', 'config.php'] as $file) {
+            $files = $this->findConfigFiles($file);
+
+            if (!empty($files)) {
+                $dumper->dump($files, 'config/'.$file, ['type' => 'namespaced']);
+            }
+        }
     }
 
     /**
@@ -236,9 +241,14 @@ private function generateDcaExtracts($cacheDir)
      */
     private function generateTemplateMapper($cacheDir)
     {
-        $mapper = [];
         $files = $this->findTemplateFiles();
 
+        if (empty($files)) {
+            return;
+        }
+
+        $mapper = [];
+
         foreach ($files as $file) {
             $mapper[$file->getBasename('.html5')] = rtrim(
                 $this->filesystem->makePathRelative($file->getPath(), $this->rootDir),

src/DependencyInjection/Compiler/AddResourcesPathsPass.php

@@ -26,7 +26,7 @@ class AddResourcesPathsPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $container->setParameter('contao.resources_paths', $this->getResourcesPath($container));
+        $container->setParameter('contao.resources_paths', $this->getResourcesPaths($container));
     }
 
     /**
@@ -36,7 +36,7 @@ public function process(ContainerBuilder $container)
      *
      * @return array
      */
-    private function getResourcesPath(ContainerBuilder $container)
+    private function getResourcesPaths(ContainerBuilder $container)
     {
         $paths = [];
         $rootDir = $container->getParameter('kernel.project_dir');

src/Framework/ContaoFramework.php

@@ -98,6 +98,14 @@ class ContaoFramework implements ContaoFrameworkInterface, ContainerAwareInterfa
         'ModuleLoader',
     ];
 
+    /**
+     * @var array
+     */
+    private $installRoutes = [
+        'contao_install',
+        'contao_install_redirect',
+    ];
+
     /**
      * Constructor.
      *
@@ -377,7 +385,9 @@ private function setDefaultLanguage()
      */
     private function validateInstallation()
     {
-        if (null === $this->request || 'contao_install' === $this->request->attributes->get('_route')) {
+        if (null === $this->request
+            || in_array($this->request->attributes->get('_route'), $this->installRoutes, true)
+        ) {
             return;
         }
 

src/Resources/contao/classes/Backend.php

@@ -1054,7 +1054,7 @@ public static function addFilesBreadcrumb($strKey='tl_files_node')
 		$GLOBALS['TL_DCA']['tl_files']['list']['sorting']['breadcrumb'] .= '
 
 <ul id="tl_breadcrumb">
-  <li>' . implode(' &gt; </li><li>', $arrLinks) . '</li>
+  <li>' . implode(' › </li><li>', $arrLinks) . '</li>
 </ul>';
 	}
 

src/Resources/contao/classes/BackendUser.php

@@ -169,7 +169,8 @@ public function authenticate()
 			return true;
 		}
 
-		$route = \System::getContainer()->get('request_stack')->getCurrentRequest()->attributes->get('_route');
+		$request = \System::getContainer()->get('request_stack')->getCurrentRequest();
+		$route = $request->attributes->get('_route');
 
 		if ($route == 'contao_backend_login')
 		{
@@ -179,9 +180,9 @@ public function authenticate()
 		$parameters = array();
 
 		// Redirect to the last page visited upon login
-		if ($route == 'contao_backend' || $route == 'contao_backend_preview')
+		if ($request->query->count() > 0 && in_array($route, array('contao_backend', 'contao_backend_preview')))
 		{
-			$parameters['referer'] = base64_encode(\Environment::get('request'));
+			$parameters['referer'] = base64_encode($request->getRequestUri());
 		}
 
 		throw new RedirectResponseException(\System::getContainer()->get('router')->generate('contao_backend_login', $parameters, UrlGeneratorInterface::ABSOLUTE_URL));

src/Resources/contao/classes/DataContainer.php

@@ -16,6 +16,7 @@
 use Contao\CoreBundle\Picker\PickerInterface;
 use Contao\Image\ResizeConfiguration;
 use Imagine\Gd\Imagine;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 
 
 /**
@@ -979,6 +980,137 @@ protected function getPickerInputField($value, $attributes='')
 	}
 
 
+	/**
+	 * Build the sort panel and return it as string
+	 *
+	 * @return string
+	 */
+	protected function panel()
+	{
+		if ($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['panelLayout'] == '')
+		{
+			return '';
+		}
+
+		// Reset all filters
+		if (isset($_POST['filter_reset']) && \Input::post('FORM_SUBMIT') == 'tl_filters')
+		{
+			/** @var AttributeBagInterface $objSessionBag */
+			$objSessionBag = \System::getContainer()->get('session')->getBag('contao_backend');
+
+			$data = $objSessionBag->all();
+
+			unset($data['filter'][$this->strTable]);
+			unset($data['filter'][$this->strTable.'_'.CURRENT_ID]);
+			unset($data['sorting'][$this->strTable]);
+			unset($data['search'][$this->strTable]);
+
+			$objSessionBag->replace($data);
+
+			$this->reload();
+		}
+
+		$intFilterPanel = 0;
+		$arrPanels = array();
+		$arrPanes = \StringUtil::trimsplit(';', $GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['panelLayout']);
+
+		foreach ($arrPanes as $strPanel)
+		{
+			$panels = '';
+			$arrSubPanels = \StringUtil::trimsplit(',', $strPanel);
+
+			foreach ($arrSubPanels as $strSubPanel)
+			{
+				$panel = '';
+
+				// Regular panels
+				if ($strSubPanel == 'search' || $strSubPanel == 'limit' || $strSubPanel == 'sort')
+				{
+					$panel = $this->{$strSubPanel . 'Menu'}();
+				}
+
+				// Multiple filter subpanels can be defined to split the fields across panels
+				elseif ($strSubPanel == 'filter')
+				{
+					$panel = $this->{$strSubPanel . 'Menu'}(++$intFilterPanel);
+				}
+
+				// Call the panel_callback
+				else
+				{
+					$arrCallback = $GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['panel_callback'][$strSubPanel];
+
+					if (is_array($arrCallback))
+					{
+						$this->import($arrCallback[0]);
+						$panel = $this->{$arrCallback[0]}->{$arrCallback[1]}($this);
+					}
+					elseif (is_callable($arrCallback))
+					{
+						$panel = $arrCallback($this);
+					}
+				}
+
+				// Add the panel if it is not empty
+				if ($panel != '')
+				{
+					$panels = $panel . $panels;
+				}
+			}
+
+			// Add the group if it is not empty
+			if ($panels != '')
+			{
+				$arrPanels[] = $panels;
+			}
+		}
+
+		if (empty($arrPanels))
+		{
+			return '';
+		}
+
+		if (\Input::post('FORM_SUBMIT') == 'tl_filters')
+		{
+			$this->reload();
+		}
+
+		$return = '';
+		$intTotal = count($arrPanels);
+		$intLast = $intTotal - 1;
+
+		for ($i=0; $i<$intTotal; $i++)
+		{
+			$submit = '';
+
+			if ($i == $intLast)
+			{
+				$submit = '
+<div class="tl_submit_panel tl_subpanel">
+  <button name="filter" id="filter" class="tl_img_submit filter_apply" title="' . \StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['applyTitle']) . '">' . $GLOBALS['TL_LANG']['MSC']['apply'] . '</button>
+  <button name="filter_reset" id="filter_reset" value="1" class="tl_img_submit filter_reset" title="' . \StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['resetTitle']) . '">' . $GLOBALS['TL_LANG']['MSC']['reset'] . '</button>
+</div>';
+			}
+
+			$return .= '
+<div class="tl_panel cf">
+  ' . $submit . $arrPanels[$i] . '
+</div>';
+		}
+
+		$return = '
+<form action="'.ampersand(\Environment::get('request'), true).'" class="tl_form" method="post">
+<div class="tl_formbody">
+  <input type="hidden" name="FORM_SUBMIT" value="tl_filters">
+  <input type="hidden" name="REQUEST_TOKEN" value="'.REQUEST_TOKEN.'">
+  ' . $return . '
+</div>
+</form>';
+
+		return $return;
+	}
+
+
 	/**
 	 * Return the name of the current palette
 	 *

src/Resources/contao/config/constants.php

@@ -10,7 +10,7 @@
 
 // Core version
 define('VERSION', '4.4');
-define('BUILD', '3');
+define('BUILD', '4');
 define('LONG_TERM_SUPPORT', true);
 
 // Link constants

src/Resources/contao/controllers/BackendMain.php

@@ -220,6 +220,8 @@ protected function output()
 		$this->Template->account = $GLOBALS['TL_LANG']['MOD']['login'][1];
 		$this->Template->preview = $GLOBALS['TL_LANG']['MSC']['fePreview'];
 		$this->Template->previewTitle = \StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['fePreviewTitle']);
+		$this->Template->profile = $GLOBALS['TL_LANG']['MSC']['profile'];
+		$this->Template->profileTitle = \StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['profileTitle']);
 		$this->Template->pageOffset = \Input::cookie('BE_PAGE_OFFSET');
 		$this->Template->logout = $GLOBALS['TL_LANG']['MSC']['logoutBT'];
 		$this->Template->logoutTitle = \StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['logoutBTTitle']);
@@ -239,6 +241,7 @@ protected function output()
 		$this->Template->systemMessages = $GLOBALS['TL_LANG']['MSC']['systemMessages'];
 		$this->Template->burger = $GLOBALS['TL_LANG']['MSC']['burgerTitle'];
 		$this->Template->learnMore = sprintf($GLOBALS['TL_LANG']['MSC']['learnMore'], '<a href="https://contao.org" target="_blank">contao.org</a>');
+		$this->Template->ref = \System::getContainer()->get('request_stack')->getCurrentRequest()->attributes->get('_contao_referer_id');
 
 		$strSystemMessages = \Backend::getSystemMessages();
 		$this->Template->systemMessagesCount = substr_count($strSystemMessages, 'class="tl_');

src/Resources/contao/dca/tl_files.php

@@ -43,6 +43,10 @@
 	// List
 	'list' => array
 	(
+		'sorting' => array
+		(
+			'panelLayout'             => 'search'
+		),
 		'global_operations' => array
 		(
 			'sync' => array
@@ -746,7 +750,7 @@ public function protectFolder(DataContainer $dc)
 		return '
 <div class="' . $class . '">
   <div id="ctrl_' . $dc->field . '" class="tl_checkbox_single_container">
-    <input type="hidden" name="' . $dc->inputName . '" value=""><input type="checkbox" name="' . $dc->inputName . '" id="opt_' . $dc->field . '_0" class="tl_checkbox" value="1"' . (($blnPublic || basename($strPath) == '__new__') ? ' checked="checked"' : '') . ' onfocus="Backend.getScrollOffset()"' . ($blnDisabled ? ' disabled' : '') . '> <label for="opt_' . $dc->field . '_0">' . $GLOBALS['TL_LANG']['tl_files']['protected'][0] . '</label>
+    <input type="hidden" name="' . $dc->inputName . '" value=""><input type="checkbox" name="' . $dc->inputName . '" id="opt_' . $dc->inputName . '_0" class="tl_checkbox" value="1"' . (($blnPublic || basename($strPath) == '__new__') ? ' checked="checked"' : '') . ' onfocus="Backend.getScrollOffset()"' . ($blnDisabled ? ' disabled' : '') . '> <label for="opt_' . $dc->inputName . '_0">' . $GLOBALS['TL_LANG']['tl_files']['protected'][0] . '</label>
   </div>' . (Config::get('showHelp') ? '
   <p class="tl_help tl_tip">' . $GLOBALS['TL_LANG']['tl_files']['protected'][1] . '</p>' : '') . '
 </div>';

src/Resources/contao/dca/tl_form.php

@@ -454,7 +454,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_form WHERE id=? OR alias=?")
 								   ->execute($dc->id, $varValue);
 
-		// Check whether the page alias exists
+		// Check whether the form alias exists
 		if ($objAlias->numRows > 1)
 		{
 			if (!$autoAlias)

src/Resources/contao/dca/tl_page.php

@@ -1092,14 +1092,12 @@ public function generateAlias($varValue, DataContainer $dc)
 			// Check if there are multiple results for the current domain
 			if (!empty($arrCheck))
 			{
-				if ($autoAlias)
-				{
-					$varValue .= '-' . $dc->id;
-				}
-				else
+				if (!$autoAlias)
 				{
 					throw new Exception(sprintf($GLOBALS['TL_LANG']['ERR']['aliasExists'], $varValue));
 				}
+
+				$varValue .= '-' . $dc->id;
 			}
 		}
 

src/Resources/contao/dca/tl_templates.php

@@ -226,7 +226,7 @@ public function addBreadcrumb()
 		$GLOBALS['TL_DCA']['tl_templates']['list']['sorting']['breadcrumb'] .= '
 
 <ul id="tl_breadcrumb">
-  <li>' . implode(' &gt; </li><li>', $arrLinks) . '</li>
+  <li>' . implode(' › </li><li>', $arrLinks) . '</li>
 </ul>';
 	}
 
@@ -341,7 +341,7 @@ public function addNewTemplate()
 <div class="tl_formbody_edit">
 <input type="hidden" name="FORM_SUBMIT" value="tl_create_template">
 <input type="hidden" name="REQUEST_TOKEN" value="'.REQUEST_TOKEN.'">
-<fieldset class="tl_tbox nolegend">
+<div class="tl_tbox cf">
 <div class="w50 widget">
   <h3><label for="ctrl_original">'.$GLOBALS['TL_LANG']['tl_templates']['original'][0].'</label></h3>
   <select name="original" id="ctrl_original" class="tl_select tl_chosen" onfocus="Backend.getScrollOffset()">'.$strAllTemplates.'</select>'.(($GLOBALS['TL_LANG']['tl_templates']['original'][1] && Config::get('showHelp')) ? '
@@ -352,7 +352,7 @@ public function addNewTemplate()
   <select name="target" id="ctrl_target" class="tl_select" onfocus="Backend.getScrollOffset()"><option value="templates">templates</option>'. $this->getTargetFolders('templates') .'</select>'.(($GLOBALS['TL_LANG']['tl_templates']['target'][1] && Config::get('showHelp')) ? '
   <p class="tl_help tl_tip">'.$GLOBALS['TL_LANG']['tl_templates']['target'][1].'</p>' : '').'
 </div>
-</fieldset>
+</div>
 </div>
 
 <div class="tl_formbody_submit">