php8 support

actions/assign_usergrouptoaccesspath.php

@@ -7,11 +7,11 @@
 $selpaths  = get_request_var('selected_accesspaths');
 $selperm   = get_request_var('permission'); // TODO: There is no check, whether this var is given!
 
-if (count($selusers) == 1 && empty($selusers[0]))
+if ($selusers != NULL && count($selusers) == 1 && empty($selusers[0]))
   $selusers = NULL;
-if (count($selgroups) == 1 && empty($selgroups[0]))
+if ($selgroups != NULL && count($selgroups) == 1 && empty($selgroups[0]))
   $selgroups = NULL;
-if (count($selpaths) == 1 && empty($selpaths[0]))
+if ($selpaths != NULL && count($selpaths) == 1 && empty($selpaths[0]))
   $selpaths = NULL;
 
 if( $selpaths == NULL || ( $selusers == NULL && $selgroups == NULL ) )

classes/providers/ldap/LdapUserViewProvider.class.php

@@ -378,6 +378,33 @@ public function getGroups()
 		return $ret;
 	}
 
+	/**
+	 * (non-PHPdoc)
+	 * @see svnadmin\core\interfaces.IGroupViewProvider::getGroupsOfSubgroup()
+	 */
+	public function getGroupsOfSubgroup($objGroup)
+	{
+		throw new Exception('not implemented');
+	}
+
+	/**
+	 * (non-PHPdoc)
+	 * @see svnadmin\core\interfaces.IGroupViewProvider::getSubgroupsOfGroup()
+	 */
+	public function getSubgroupsOfGroup($objGroup)
+	{
+		throw new Exception('not implemented');
+	}
+
+	/**
+	* (non-PHPdoc)
+	* @see svnadmin\core\interfaces.IGroupViewProvider::getSubgroupsOfGroup()
+	*/
+	public function isSubgroupInGroup($objSubgroup, $objGroup)
+	{
+		throw new Exception('not implemented');
+	}
+
 	/**
 	 * (non-PHPdoc)
 	 * @see svnadmin\core\interfaces.IGroupViewProvider::groupExists()

classes/util/global.func.php

@@ -1,25 +1,7 @@
 <?php
 function checkPHPVersion($minimumVersion)
 {
-  $phpVersion = phpversion();
-  $phpVersionParts = explode(".", $phpVersion);
-  $minVersionParts = explode(".", $minimumVersion);
-  $minVersionPartsCount = count($minVersionParts);
-
-  $check = true;
-  if ($minVersionPartsCount >= 1)
-    if ($phpVersionParts[0] < $minVersionParts[0])
-      $check = false;
-
-  if ($minVersionPartsCount >= 2 && $phpVersionParts[0] == $minVersionParts[0])
-    if ($phpVersionParts[1] < $minVersionParts[1])
-      $check = false;
-
-  if ($minVersionPartsCount >= 3 && $phpVersionParts[0] == $minVersionParts[0] && $phpVersionParts[1] == $minVersionParts[1])
-    if ($phpVersionParts[2] < $minVersionParts[2])
-      $check = false;
-
-  return $check;
+  return version_compare(PHP_VERSION, $minimumVersion);
 }
 
 function exception_handler($exception)
@@ -271,4 +253,4 @@ function HtmlFilterBox($tableId, $columnIndex=0)
 	</div>
 <?php
 }
-?>
+?>

include/ifcorelib/IF_HtPasswd.class.php

@@ -416,7 +416,7 @@ private function crypt_apr1_md5($plainpasswd, $salt = "")
 
 		for($i=$len; $i>0; $i>>=1)
 		{
-			$text.= ($i & 1) ? chr(0) : $plainpasswd{0};
+			$text.= ($i & 1) ? chr(0) : $plainpasswd[0];
 		}
 
 		$bin = pack("H32", md5($text));
@@ -449,4 +449,4 @@ private function crypt_apr1_md5($plainpasswd, $salt = "")
 		return "$"."apr1"."$".$salt."$".$tmp;
 	}
 }
-?>
+?>

include/ifcorelib/IF_IniFile.func.php

@@ -105,6 +105,10 @@ function if_write_ini_file( $dest_filename, $data )
   }
 
   $fh = fopen( $dest_filename, "w" );
+  if ( !is_resource( $fh ) )
+  {
+    return false; // failed to open file
+  }
   flock( $fh, LOCK_EX );
   foreach( $data as $section_name=>$section_data ) // iterate sections.
   {
@@ -156,4 +160,4 @@ function if_backup_file( $filename, $backup_folder )
   }
   return $dest_backup_file;
 }
-?>
+?>