correct SMF2.1 bridge; correct install with PHP 8.1+ when using GD2

coppermine-gallery · Apr 10, 2023 · e1da86f · e1da86f
1 parent 5164a11
commit e1da86f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 3 or later; see LICENSE
  *
  * CHANGELOG.txt
- * @since  1.6.23
+ * @since  1.6.24
  */
 Changelog
 =========
@@ -20,6 +20,7 @@ Changelog
 [S] = Security fix (issues that are related to security)
 *********************************************
 
+2023-04-10 [B] Correct SMF2.1 bridge; correct install with PHP 8.1+ when using GD2 {ron4mac}
 2023-03-22 [M] Reduce possibility of race condition at completion of uploads {ron4mac}
 2023-03-20 [B] Correct failure to remove file upload with dimension restriction {ron4mac}
 2023-03-02 [B] Correct for PHP8+ round error in exif parse {ron4mac}

diff --git a/bridge/smf21.inc.php b/bridge/smf21.inc.php
@@ -4,11 +4,11 @@
  *
  * v1.0 originally written by Gregory Demar
  *
- * @copyright  Copyright (c) 2003-2021 Coppermine Dev Team
+ * @copyright  Copyright (c) 2003-2023 Coppermine Dev Team
  * @license    GNU General Public License version 3 or later; see LICENSE
  *
  * bridge/smf21.inc.php
- * @since  1.6.16
+ * @since  1.6.24
  */
 
 if (!defined('IN_COPPERMINE')) die('Not in Coppermine...');
@@ -86,7 +86,7 @@ function __construct()
                 'regdate' => 'date_registered', // name of 'registered' field in users table
                 'lastvisit' => 'last_login', // last time user logged in
                 'active' => 'is_activated', // is user account active?
-                'location' => 'location', // name of 'location' field in users table
+                'location' => '\'\'', // name of 'location' field in users table
                 'website' => 'website_url', // name of 'website' field in users table
                 'usertbl_group_id' => 'id_post_group', // name of 'group id' field in users table
                 'grouptbl_group_id' => 'id_group', // name of 'group id' field in groups table

diff --git a/include/cpg16x.files.xml b/include/cpg16x.files.xml
@@ -2,10 +2,10 @@
 <file_data>
 	<element>
 		<fullpath>CHANGELOG.txt</fullpath>
-		<version>1.6.23</version>
+		<version>1.6.24</version>
 		<status>optional</status>
 		<permission>read</permission>
-		<hash>71abac4c7f020f7cf9785e202e75b133</hash>
+		<hash>1f08f51e740702be15d9dfb94b8bb7fe</hash>
 	</element>
 	<element>
 		<fullpath>LICENSE.txt</fullpath>
@@ -184,10 +184,10 @@
 	</element>
 	<element>
 		<fullpath>bridge/smf21.inc.php</fullpath>
-		<version>1.6.16</version>
+		<version>1.6.24</version>
 		<status>optional</status>
 		<permission>read</permission>
-		<hash>70eed1c7a08fcb71d02e14633bd46dd4</hash>
+		<hash>685eca0ad68dc055a16d0150f5551c8b</hash>
 	</element>
 	<element>
 		<fullpath>bridge/udb_base.inc.php</fullpath>
@@ -5371,10 +5371,10 @@
 	</element>
 	<element>
 		<fullpath>include/init.inc.php</fullpath>
-		<version>1.6.23</version>
+		<version>1.6.24</version>
 		<status>mandatory</status>
 		<permission>read</permission>
-		<hash>f2cc530e2aa25a6224596aa23804a5cd</hash>
+		<hash>37baae5e922e11dac70dd78b0344b7db</hash>
 	</element>
 	<element>
 		<fullpath>include/inspekt.php</fullpath>
@@ -6895,10 +6895,10 @@
 	</element>
 	<element>
 		<fullpath>install.php</fullpath>
-		<version>1.6.16</version>
+		<version>1.6.24</version>
 		<status>mandatory</status>
 		<permission>read</permission>
-		<hash>ae21f930d7b4f3efc079e3a3082245a2</hash>
+		<hash>e69a28674be86627598eb8ba8daaad02</hash>
 	</element>
 	<element>
 		<fullpath>js/</fullpath>

diff --git a/include/init.inc.php b/include/init.inc.php
@@ -8,10 +8,10 @@
  * @license    GNU General Public License version 3 or later; see LICENSE
  *
  * include/init.inc.php
- * @since  1.6.23
+ * @since  1.6.24
  */
 
-define('COPPERMINE_VERSION', '1.6.23');
+define('COPPERMINE_VERSION', '1.6.24');
 define('COPPERMINE_VERSION_STATUS', 'stable');
 // Define path to jQuery for this version of Coppermine
 define('CPG_JQUERY_VERSION', 'js/jquery-1.12.4.js');

diff --git a/install.php b/install.php
@@ -4,11 +4,11 @@
  *
  * v1.0 originally written by Gregory Demar
  *
- * @copyright  Copyright (c) 2003-2021 Coppermine Dev Team
+ * @copyright  Copyright (c) 2003-2023 Coppermine Dev Team
  * @license    GNU General Public License version 3 or later; see LICENSE
  *
  * install.php
- * @since  1.6.16
+ * @since  1.6.24
  */
 
 ########################
@@ -2051,7 +2051,7 @@ function testTextOnImage()
 				'error'		=> 'write_error',
 			);
 		}
-		@imagedestroy($source_a);
+		@imagedestroy($source);
 
 		return $results;
 	}