Merge branch 'hotfix/2.11.13' into support/2.11

contao · Nov 19, 2013 · 98857d1 · 98857d1
2 parents d3ae42d + fbff431
commit 98857d1
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Contao Open Source CMS Changelog
 ================================
 
+Version 2.11.13 (2013-11-19)
+----------------------------
+
+### Fixed
+Sort the list of available modules (see #6391).
+
+### Fixed
+Decode entities in passwords (see #6252).
+
+### Fixed
+Replace insert tags in the details view of the listing module (see #6120).
+
+
 Version 2.11.12 (2013-08-22)
 ----------------------------
 

diff --git a/contao/contao-uncompressed.js b/contao/contao-uncompressed.js
@@ -700,7 +700,7 @@ var AjaxRequest =
 				'display': 'block',
 				'top': scroll.y + 'px'
 			}
-		})
+		});
 
 		if (box == null) {
 			box = new Element('div', {
@@ -1428,7 +1428,7 @@ var Backend =
 			for (var j=0; j<childs.length; j++) {
 				if (input = childs[j].getFirst('input')) {
 					input.set('tabindex', tabindex++);
-					input.name = input.name.replace(/\[[0-9]+\]/g, '[' + i + ']')
+					input.name = input.name.replace(/\[[0-9]+\]/g, '[' + i + ']');
 					if (input.type == 'checkbox') {
 						input.id = input.name.replace(/\[[0-9]+\]/g, '').replace(/\[/g, '_').replace(/\]/g, '') + '_' + i;
 						input.getNext('label').set('for', input.id);
@@ -1616,7 +1616,7 @@ var ContextMenu =
 			});
 		});
 
-		// Hide the context menu 
+		// Hide the context menu
 		$(document.body).addEvent('click', function() {
 			ContextMenu.hide();
 		});

diff --git a/system/constants.php b/system/constants.php
@@ -57,7 +57,7 @@
  * the web browser reload those resources after a Contao update.
  */
 define('VERSION', '2.11');
-define('BUILD', '12');
+define('BUILD', '13');
 define('LONG_TERM_SUPPORT', true);
 define('CODEMIRROR', '2.2');
 define('DATEPICKER', '2.1.1');

diff --git a/system/functions.php b/system/functions.php
@@ -133,7 +133,8 @@ function __error($intType, $strMessage, $strFile, $intLine)
 		E_USER_NOTICE       => 'Notice',
 		E_STRICT            => 'Runtime notice',
 		4096                => 'Recoverable error',
-		8192                => 'Deprecated notice'
+		8192                => 'Deprecated notice',
+		16384               => 'Deprecated notice'
 	);
 
 	// Ignore functions with an error control operator (@function_name)
@@ -397,7 +398,7 @@ function deserialize($varValue, $blnForceArray=false)
  * Split a string into fragments, remove whitespace and return fragments as array
  * @param string
  * @param string
- * @return string
+ * @return array
  */
 function trimsplit($strPattern, $strString)
 {

diff --git a/system/libraries/Config.php b/system/libraries/Config.php
@@ -189,7 +189,7 @@ protected function initialize()
 				$strMode = 'bottom';
 				continue;
 			}
-			
+
 			if ($strMode == 'top')
 			{
 				$this->strTop .= $strLine;
@@ -286,6 +286,7 @@ public function getActiveModules($blnNoCache=false)
 		else
 		{
 			$arrAllModules = scan(TL_ROOT . '/system/modules');
+			sort($arrAllModules); // see #6391
 		}
 
 		$arrInactiveModules = deserialize($GLOBALS['TL_CONFIG']['inactiveModules']);

diff --git a/system/libraries/Database.php b/system/libraries/Database.php
@@ -1008,11 +1008,7 @@ public function fetchAssoc()
 	public function fetchEach($strKey)
 	{
 		$arrReturn = array();
-
-		if ($this->intIndex < 0)
-		{
-			$this->fetchAllAssoc();
-		}
+		$this->fetchAllAssoc();
 
 		foreach ($this->arrCache as $arrRow)
 		{
@@ -1110,7 +1106,7 @@ public function next()
 	 */
 	public function prev()
 	{
-		if ($this->intIndex == 0)
+		if ($this->intIndex < 1)
 		{
 			return false;
 		}

diff --git a/system/libraries/File.php b/system/libraries/File.php
@@ -68,7 +68,7 @@ class File extends System
 	/**
 	 * Check whether a file exists
 	 * @param string
-	 * @throws Expcetion
+	 * @throws Exception
 	 */
 	public function __construct($strFile)
 	{

diff --git a/system/libraries/Folder.php b/system/libraries/Folder.php
@@ -50,7 +50,7 @@ class Folder extends System
 	/**
 	 * Check whether a folder exists
 	 * @param string
-	 * @throws Expcetion
+	 * @throws Exception
 	 */
 	public function __construct($strFolder)
 	{

diff --git a/system/libraries/User.php b/system/libraries/User.php
@@ -167,7 +167,7 @@ public function login()
 		$this->loadLanguageFile('default');
 
 		// Do not continue if username or password are missing
-		if (!$this->Input->post('username') || !$this->Input->post('password'))
+		if (!$this->Input->post('username') || !$this->Input->post('password', true))
 		{
 			return false;
 		}
@@ -183,7 +183,7 @@ public function login()
 				foreach ($GLOBALS['TL_HOOKS']['importUser'] as $callback)
 				{
 					$this->import($callback[0], 'objImport', true);
-					$blnLoaded = $this->objImport->$callback[1]($this->Input->post('username'), $this->Input->post('password'), $this->strTable);
+					$blnLoaded = $this->objImport->$callback[1]($this->Input->post('username'), $this->Input->post('password', true), $this->strTable);
 
 					// Load successfull
 					if ($blnLoaded === true)
@@ -244,15 +244,15 @@ public function login()
 		list($strPassword, $strSalt) = explode(':', $this->password);
 
 		// Password is correct but not yet salted
-		if (!strlen($strSalt) && $strPassword == sha1($this->Input->post('password')))
+		if (!strlen($strSalt) && $strPassword == sha1($this->Input->post('password', true)))
 		{
 			$strSalt = substr(md5(uniqid(mt_rand(), true)), 0, 23);
-			$strPassword = sha1($strSalt . $this->Input->post('password'));
+			$strPassword = sha1($strSalt . $this->Input->post('password', true));
 			$this->password = $strPassword . ':' . $strSalt;
 		}
 
 		// Check the password against the database
-		if (strlen($strSalt) && $strPassword == sha1($strSalt . $this->Input->post('password')))
+		if (strlen($strSalt) && $strPassword == sha1($strSalt . $this->Input->post('password', true)))
 		{
 			$blnAuthenticated = true;
 		}
@@ -263,7 +263,7 @@ public function login()
 			foreach ($GLOBALS['TL_HOOKS']['checkCredentials'] as $callback)
 			{
 				$this->import($callback[0], 'objAuth', true);
-				$blnAuthenticated = $this->objAuth->$callback[1]($this->Input->post('username'), $this->Input->post('password'), $this);
+				$blnAuthenticated = $this->objAuth->$callback[1]($this->Input->post('username'), $this->Input->post('password', true), $this);
 
 				// Authentication successfull
 				if ($blnAuthenticated === true)

diff --git a/system/libraries/ZipReader.php b/system/libraries/ZipReader.php
@@ -417,6 +417,19 @@ public function unzip()
 	 */
 	protected function readCentralDirectory()
 	{
+		$strMbCharset = null;
+
+		// Set the mbstring encoding to ASCII (see #5842)
+		if (ini_get('mbstring.func_overload') > 0)
+		{
+			$strMbCharset = mb_internal_encoding();
+
+			if (mb_internal_encoding('ASCII') === false)
+			{
+				$strMbCharset = null;
+			}
+		}
+
 		$intOffset = 0;
 		$intInterval = min(filesize(TL_ROOT . '/' . $this->strFile), 1024);
 		$strBuffer = '';
@@ -516,6 +529,8 @@ protected function readCentralDirectory()
 
 		$this->intLast = (count($this->arrFiles) - 1);
 
+		// Restore the mbstring encoding (see #5842)
+		$strMbCharset && mb_internal_encoding($strMbCharset);
 	}
 
 

diff --git a/system/modules/backend/FileUpload.php b/system/modules/backend/FileUpload.php
@@ -87,7 +87,7 @@ public function hasResized()
 	 * @param string
 	 * @param string
 	 * @return array
-	 * @throws Expcetion
+	 * @throws Exception
 	 */
 	public function uploadTo($strTarget, $strKey)
 	{

diff --git a/system/modules/listing/ModuleListing.php b/system/modules/listing/ModuleListing.php
@@ -358,6 +358,7 @@ protected function listSingleRecord($id)
 		$this->Template->referer = 'javascript:history.go(-1)';
 		$this->Template->back = $GLOBALS['TL_LANG']['MSC']['goBack'];
 		$this->list_info = deserialize($this->list_info);
+		$this->list_info_where = $this->replaceInsertTags($this->list_info_where);
 
 		$objRecord = $this->Database->prepare("SELECT " . $this->list_info . " FROM " . $this->list_table . " WHERE " . (strlen($this->list_info_where) ? $this->list_info_where . " AND " : "") . $this->strPk . "=?")
 									->limit(1)

diff --git a/system/modules/rep_base/RepositorySettings.php b/system/modules/rep_base/RepositorySettings.php
@@ -42,6 +42,16 @@
 
 // valid core versions in descending order
 define('REPOSITORY_COREVERSIONS',
+		'30020006,30020006;'.	// 3.2.0 RC1
+		'30020004,30020004;'.	// 3.2.0 beta2
+		'30020003,30020003;'.	// 3.2.0 beta1
+		'30010059,30010059;'.	// 3.1.5 stable
+		'30010049,30010049;'.	// 3.1.4 stable
+		'30010039,30010039;'.	// 3.1.3 stable
+		'30010029,30010029;'.	// 3.1.2 stable
+		'30010019,30010019;'.	// 3.1.1 stable
+		'30010009,30010009;'.	// 3.1.0 stable
+		'30010006,30010006;'.	// 3.1.0 RC1
 		'30010003,30010003;'.	// 3.1.0 beta1
 		'30000069,30000069;'.	// 3.0.6 stable
 		'30000059,30000059;'.	// 3.0.5 stable
@@ -52,6 +62,7 @@
 		'30000009,30000009;'.	// 3.0.0 stable
 		'30000006,30000006;'.	// 3.0.0 RC1
 		'30000003,30000003;'.	// 3.0.0 beta1
+		'20110139,20110139;'.	// 2.11.13 stable
 		'20110129,20110129;'.	// 2.11.12 stable
 		'20110119,20110119;'.	// 2.11.11 stable
 		'20110109,20110109;'.	// 2.11.10 stable

diff --git a/system/themes/default/iefixes.css b/system/themes/default/iefixes.css
diff --git a/system/themes/default/src/iefixes.css b/system/themes/default/src/iefixes.css
@@ -81,7 +81,7 @@
 .tl_folder_list,.tl_folder_tlist {
 	padding:0 0 2px 0;
 }
-.ie7 tl_folder_list,.ie7 .tl_folder_tlist {
+.ie7 .tl_folder_list,.ie7 .tl_folder_tlist {
 	padding:0;
 }
 .tl_file_list {

diff --git a/system/themes/default/src/switch.css b/system/themes/default/src/switch.css
@@ -30,7 +30,7 @@
 html,body {
 	background:#333633;
 }
-a,body,div,form,input,selectlabel,p {
+a,body,div,form,input,select,label,p {
 	color:#333633;
 }
 p {

diff --git a/system/themes/default/switch.css b/system/themes/default/switch.css