Prepare 3.3.4 release

Michael Babker · Michael Babker · commit 7d105613d7a8 · 2014-09-22T08:45:59.000-04:00
diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php
@@ -90,7 +90,7 @@ function getFolderList($base = null)
 		// so both string and integer are supported.
 		if ($asset == 0)
 		{
-			$asset = $input->get('asset', 0, 'string');
+			$asset = $input->get('asset', 0, 'cmd');
 		}
 
 		$author = $input->get('author', 0, 'integer');
diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php
@@ -13,7 +13,7 @@
 
 // Installation check, and check on removal of the install directory.
 if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
-	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION . '/index.php')*/)
+	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) || file_exists(JPATH_INSTALLATION . '/index.php'))
 {
 	if (file_exists(JPATH_INSTALLATION . '/index.php'))
 	{
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.3.4-dev</version>
-	<creationDate>July 2014</creationDate>
+	<version>3.3.4</version>
+	<creationDate>September 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/includes/framework.php b/includes/framework.php
@@ -13,7 +13,7 @@
 
 // Installation check, and check on removal of the install directory.
 if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
-	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION . '/index.php')*/)
+	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) || file_exists(JPATH_INSTALLATION . '/index.php'))
 {
 	if (file_exists(JPATH_INSTALLATION . '/index.php'))
 	{
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -25,10 +25,10 @@ final class JVersion
 	public $RELEASE = '3.3';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '4-dev';
+	public $DEV_LEVEL = '4';
 
 	/** @var  string  Development STATUS. */
-	public $DEV_STATUS = 'Development';
+	public $DEV_STATUS = 'Stable';
 
 	/** @var  string  Build number. */
 	public $BUILD = '';
@@ -37,10 +37,10 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '25-July-2014';
+	public $RELDATE = '23-September-2014';
 
 	/** @var  string  Release time. */
-	public $RELTIME = '13:00';
+	public $RELTIME = '14:00';
 
 	/** @var  string  Release timezone. */
 	public $RELTZ = 'GMT';
diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php
@@ -38,6 +38,9 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		// For JLog
 		$response->type = 'LDAP';
 
+		// Strip null bytes from the password
+		$credentials['password'] = str_replace(chr(0), '', $credentials['password']);
+
 		// LDAP does not like Blank passwords (tries to Anon Bind which is bad)
 		if (empty($credentials['password']))
 		{

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ function getFolderList($base = null)`
`90`	`90`	`// so both string and integer are supported.`
`91`	`91`	`if ($asset == 0)`
`92`	`92`	`{`
`93`		`- $asset = $input->get('asset', 0, 'string');`
	`93`	`+ $asset = $input->get('asset', 0, 'cmd');`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`$author = $input->get('author', 0, 'integer');`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`// Installation check, and check on removal of the install directory.`
`15`	`15`	`if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')`
`16`		`- \|\| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /\|\| file_exists(JPATH_INSTALLATION . '/index.php')/)`
	`16`	`+ \|\| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) \|\| file_exists(JPATH_INSTALLATION . '/index.php'))`
`17`	`17`	`{`
`18`	`18`	`if (file_exists(JPATH_INSTALLATION . '/index.php'))`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ public function onUserAuthenticate($credentials, $options, &$response)`
`38`	`38`	`// For JLog`
`39`	`39`	`$response->type = 'LDAP';`
`40`	`40`
	`41`	`+ // Strip null bytes from the password`
	`42`	`+ $credentials['password'] = str_replace(chr(0), '', $credentials['password']);`
	`43`	`+`
`41`	`44`	`// LDAP does not like Blank passwords (tries to Anon Bind which is bad)`
`42`	`45`	`if (empty($credentials['password']))`
`43`	`46`	`{`