Merge branch 'hotfix/4.4.7'

contao · Oct 12, 2017 · a3b6814 · a3b6814
2 parents 05295bf + f0df954
commit a3b6814
Show file tree

Hide file tree

Showing 47 changed files with 232 additions and 118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,8 @@
 /composer.lock
 /vendor/
 
+# Node
+/node_modules/
+
 # PhpUnit
 /phpunit.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Contao core bundle change log
 
+### 4.4.7 (2017-10-12)
+
+ * Show broken images in the file manager (see #1116).
+ * Copy the existing referers if a new referer ID is initialized (see #1117).
+ * Stop using the TinyMCE gzip compressor (deprecated since 2014).
+ * Prevent the User::authenticate() method from running twice (see #1067).
+
 ### 4.4.6 (2017-09-28)
 
  * Bind the lock file path to the installation root directory (see #1107).

diff --git a/composer.json b/composer.json
@@ -67,7 +67,7 @@
         "contao-components/swipe": "^2.0.3",
         "contao-components/tablesort": "^3.4.5",
         "contao-components/tablesorter": "^2.0.5.3",
-        "contao-components/tinymce4": "^4.6.3"
+        "contao-components/tinymce4": "4.6.*"
     },
     "require-dev": {
         "ext-fileinfo": "*",

diff --git a/src/Cache/ContaoCacheWarmer.php b/src/Cache/ContaoCacheWarmer.php
@@ -270,14 +270,25 @@ private function generateTemplateMapper($cacheDir)
     private function getLanguagesInUse()
     {
         // Get all languages in use (see #6013)
-        $query = "
-            SELECT language FROM tl_member
-            UNION SELECT language FROM tl_user
-            UNION SELECT REPLACE(language, '-', '_') FROM tl_page
-            WHERE type='root'
-        ";
-
-        $statement = $this->connection->prepare($query);
+        $statement = $this->connection->prepare("
+            SELECT
+                language
+            FROM
+                tl_member
+            UNION
+                SELECT
+                    language
+                FROM
+                    tl_user
+            UNION
+                SELECT
+                    REPLACE(language, '-', '_')
+                FROM
+                    tl_page
+                WHERE
+                    type = 'root'
+        ");
+
         $statement->execute();
 
         $languages = [];

diff --git a/src/Cors/WebsiteRootsConfigProvider.php b/src/Cors/WebsiteRootsConfigProvider.php
@@ -46,11 +46,21 @@ public function getOptions(Request $request)
             return [];
         }
 
-        $stmt = $this->connection->prepare("SELECT id FROM tl_page WHERE type='root' AND dns=:dns");
+        $stmt = $this->connection->prepare("
+            SELECT EXISTS (
+                SELECT
+                    id
+                FROM
+                    tl_page
+                WHERE
+                    type = 'root' AND dns = :dns
+            )
+        ");
+
         $stmt->bindValue('dns', preg_replace('@^https?://@', '', $request->headers->get('origin')));
         $stmt->execute();
 
-        if (0 === $stmt->rowCount()) {
+        if (!$stmt->fetchColumn()) {
             return [];
         }
 

diff --git a/src/Doctrine/Schema/DcaSchemaProvider.php b/src/Doctrine/Schema/DcaSchemaProvider.php
@@ -82,7 +82,7 @@ public function appendToSchema(Schema $schema)
 
             if (isset($definitions['TABLE_FIELDS'])) {
                 foreach ($definitions['TABLE_FIELDS'] as $fieldName => $sql) {
-                    $this->parseColumnSql($table, $fieldName, strtolower(substr($sql, strlen($fieldName) + 3)));
+                    $this->parseColumnSql($table, $fieldName, substr($sql, strlen($fieldName) + 3));
                 }
             }
 
@@ -161,19 +161,19 @@ private function parseColumnSql(Table $table, $columnName, $sql)
         $type = $this->doctrine->getConnection()->getDatabasePlatform()->getDoctrineTypeMapping($type);
         $length = (0 === (int) $length) ? null : (int) $length;
 
-        if (preg_match('/default (\'[^\']*\'|\d+)/', $def, $match)) {
+        if (preg_match('/default (\'[^\']*\'|\d+)/i', $def, $match)) {
             $default = trim($match[1], "'");
         }
 
         $options = [
             'length' => $length,
-            'unsigned' => false !== strpos($def, 'unsigned'),
+            'unsigned' => false !== stripos($def, 'unsigned'),
             'fixed' => $fixed,
             'default' => $default,
-            'notnull' => false !== strpos($def, 'not null'),
+            'notnull' => false !== stripos($def, 'not null'),
             'scale' => null,
             'precision' => null,
-            'autoincrement' => false !== strpos($def, 'auto_increment'),
+            'autoincrement' => false !== stripos($def, 'auto_increment'),
             'comment' => null,
         ];
 
@@ -188,12 +188,12 @@ private function parseColumnSql(Table $table, $columnName, $sql)
     /**
      * Sets the length, scale, precision and fixed values by field type.
      *
-     * @param string $type
-     * @param string $dbType
-     * @param int    $length
-     * @param int    $scale
-     * @param int    $precision
-     * @param bool   $fixed
+     * @param string   $type
+     * @param string   $dbType
+     * @param int|null $length
+     * @param int      $scale
+     * @param int      $precision
+     * @param bool     $fixed
      */
     private function setLengthAndPrecisionByType($type, $dbType, &$length, &$scale, &$precision, &$fixed)
     {

diff --git a/src/EventListener/StoreRefererListener.php b/src/EventListener/StoreRefererListener.php
@@ -148,7 +148,7 @@ private function prepareBackendReferer($refererId, array $referers = null)
         }
 
         if (!isset($referers[$refererId]) || !is_array($referers[$refererId])) {
-            $referers[$refererId] = ['last' => ''];
+            $referers[$refererId] = end($referers) ?: ['last' => ''];
         }
 
         // Make sure we never have more than 25 different referer URLs

diff --git a/src/Monolog/ContaoTableHandler.php b/src/Monolog/ContaoTableHandler.php
@@ -134,8 +134,11 @@ private function createStatement()
         }
 
         $this->statement = $this->container->get($this->dbalServiceName)->prepare('
-            INSERT INTO tl_log (tstamp, source, action, username, text, func, ip, browser)
-            VALUES (:tstamp, :source, :action, :username, :text, :func, :ip, :browser)
+            INSERT INTO
+                tl_log
+                    (tstamp, source, action, username, text, func, ip, browser)
+                VALUES
+                    (:tstamp, :source, :action, :username, :text, :func, :ip, :browser)
         ');
     }
 

diff --git a/src/Resources/contao/config/constants.php b/src/Resources/contao/config/constants.php
@@ -10,7 +10,7 @@
 
 // Core version
 define('VERSION', '4.4');
-define('BUILD', '6');
+define('BUILD', '7');
 define('LONG_TERM_SUPPORT', true);
 
 // Link constants

diff --git a/src/Resources/contao/controllers/BackendAlerts.php b/src/Resources/contao/controllers/BackendAlerts.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 
 
@@ -35,7 +36,10 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
 
 		\System::loadLanguageFile('default');
 	}

diff --git a/src/Resources/contao/controllers/BackendConfirm.php b/src/Resources/contao/controllers/BackendConfirm.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
@@ -36,7 +37,10 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
 
 		\System::loadLanguageFile('default');
 		\System::loadLanguageFile('modules');

diff --git a/src/Resources/contao/controllers/BackendFile.php b/src/Resources/contao/controllers/BackendFile.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -44,7 +45,11 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
+
 		\System::loadLanguageFile('default');
 	}
 

diff --git a/src/Resources/contao/controllers/BackendHelp.php b/src/Resources/contao/controllers/BackendHelp.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 
 
@@ -35,7 +36,10 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
 
 		\System::loadLanguageFile('default');
 		\System::loadLanguageFile('modules');

diff --git a/src/Resources/contao/controllers/BackendMain.php b/src/Resources/contao/controllers/BackendMain.php
@@ -12,6 +12,7 @@
 
 use Contao\CoreBundle\Event\ContaoCoreEvents;
 use Contao\CoreBundle\Event\PreviewUrlCreateEvent;
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Knp\Bundle\TimeBundle\DateTimeFormatter;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -51,7 +52,10 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
 
 		// Password change required
 		if ($this->User->pwChange)

diff --git a/src/Resources/contao/controllers/BackendPage.php b/src/Resources/contao/controllers/BackendPage.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -44,7 +45,11 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
+
 		\System::loadLanguageFile('default');
 	}
 

diff --git a/src/Resources/contao/controllers/BackendPassword.php b/src/Resources/contao/controllers/BackendPassword.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Patchwork\Utf8;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -37,7 +38,10 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
 
 		\System::loadLanguageFile('default');
 		\System::loadLanguageFile('modules');

diff --git a/src/Resources/contao/controllers/BackendPopup.php b/src/Resources/contao/controllers/BackendPopup.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 
 
@@ -42,7 +43,11 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
+
 		\System::loadLanguageFile('default');
 
 		$strFile = \Input::get('src', true);

diff --git a/src/Resources/contao/controllers/BackendPreview.php b/src/Resources/contao/controllers/BackendPreview.php
@@ -12,6 +12,7 @@
 
 use Contao\CoreBundle\Event\ContaoCoreEvents;
 use Contao\CoreBundle\Event\PreviewUrlConvertEvent;
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
@@ -38,7 +39,11 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
+
 		\System::loadLanguageFile('default');
 	}
 

diff --git a/src/Resources/contao/controllers/BackendSwitch.php b/src/Resources/contao/controllers/BackendSwitch.php
@@ -10,6 +10,7 @@
 
 namespace Contao;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 
 
@@ -35,7 +36,11 @@ public function __construct()
 		$this->import('BackendUser', 'User');
 		parent::__construct();
 
-		$this->User->authenticate();
+		if (!\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_USER'))
+		{
+			throw new AccessDeniedException('Access denied');
+		}
+
 		\System::loadLanguageFile('default');
 	}