Merge pull request #10961 from annando/deprecated
Removed and replaced deprecated functionalities
This commit is contained in:
		
				commit
				
					
						8d550ad4e8
					
				
			
		
					 12 changed files with 22 additions and 229 deletions
				
			
		|  | @ -57,36 +57,6 @@ class Contact | |||
| 	const DEFAULT_AVATAR_THUMB = '/images/person-80.jpg'; | ||||
| 	const DEFAULT_AVATAR_MICRO = '/images/person-48.jpg'; | ||||
| 
 | ||||
| 	/** | ||||
| 	 * @deprecated since version 2019.03 | ||||
| 	 * @see User::PAGE_FLAGS_NORMAL | ||||
| 	 */ | ||||
| 	const PAGE_NORMAL    = User::PAGE_FLAGS_NORMAL; | ||||
| 	/** | ||||
| 	 * @deprecated since version 2019.03 | ||||
| 	 * @see User::PAGE_FLAGS_SOAPBOX | ||||
| 	 */ | ||||
| 	const PAGE_SOAPBOX   = User::PAGE_FLAGS_SOAPBOX; | ||||
| 	/** | ||||
| 	 * @deprecated since version 2019.03 | ||||
| 	 * @see User::PAGE_FLAGS_COMMUNITY | ||||
| 	 */ | ||||
| 	const PAGE_COMMUNITY = User::PAGE_FLAGS_COMMUNITY; | ||||
| 	/** | ||||
| 	 * @deprecated since version 2019.03 | ||||
| 	 * @see User::PAGE_FLAGS_FREELOVE | ||||
| 	 */ | ||||
| 	const PAGE_FREELOVE  = User::PAGE_FLAGS_FREELOVE; | ||||
| 	/** | ||||
| 	 * @deprecated since version 2019.03 | ||||
| 	 * @see User::PAGE_FLAGS_BLOG | ||||
| 	 */ | ||||
| 	const PAGE_BLOG      = User::PAGE_FLAGS_BLOG; | ||||
| 	/** | ||||
| 	 * @deprecated since version 2019.03 | ||||
| 	 * @see User::PAGE_FLAGS_PRVGROUP | ||||
| 	 */ | ||||
| 	const PAGE_PRVGROUP  = User::PAGE_FLAGS_PRVGROUP; | ||||
| 	/** | ||||
| 	 * @} | ||||
| 	 */ | ||||
|  |  | |||
|  | @ -114,21 +114,4 @@ class FileTag | |||
| 
 | ||||
| 		return $return; | ||||
| 	} | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Get file tags from list | ||||
| 	 * | ||||
| 	 * ex. given music,video return <music><video> or [music][video] | ||||
| 	 * @param string $list A comma delimited list of tags. | ||||
| 	 * @param string $type Optional file type. | ||||
| 	 * | ||||
| 	 * @return string       A list of file tags. | ||||
| 	 * @deprecated since 2019.06 use arrayToFile() instead | ||||
| 	 */ | ||||
| 	public static function listToFile(string $list, string $type = 'file') | ||||
| 	{ | ||||
| 		$list_array = explode(',', $list); | ||||
| 
 | ||||
| 		return self::arrayToFile($list_array, $type); | ||||
| 	} | ||||
| } | ||||
|  |  | |||
|  | @ -251,28 +251,6 @@ class Group | |||
| 		return $return; | ||||
| 	} | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Mark a group as deleted based on its name | ||||
| 	 * | ||||
| 	 * @param int    $uid | ||||
| 	 * @param string $name | ||||
| 	 * @return bool | ||||
| 	 * @throws \Exception | ||||
| 	 * @deprecated Use Group::remove instead | ||||
| 	 * | ||||
| 	 */ | ||||
| 	public static function removeByName($uid, $name) | ||||
| 	{ | ||||
| 		$return = false; | ||||
| 		if (!empty($uid) && !empty($name)) { | ||||
| 			$gid = self::getIdByName($uid, $name); | ||||
| 
 | ||||
| 			$return = self::remove($gid); | ||||
| 		} | ||||
| 
 | ||||
| 		return $return; | ||||
| 	} | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Adds a contact to a group | ||||
| 	 * | ||||
|  | @ -317,26 +295,6 @@ class Group | |||
| 		return $return; | ||||
| 	} | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Removes a contact from a group based on its name | ||||
| 	 * | ||||
| 	 * @param int    $uid | ||||
| 	 * @param string $name | ||||
| 	 * @param int    $cid | ||||
| 	 * @return boolean | ||||
| 	 * @throws \Exception | ||||
| 	 * @deprecated Use Group::removeMember instead | ||||
| 	 * | ||||
| 	 */ | ||||
| 	public static function removeMemberByName($uid, $name, $cid) | ||||
| 	{ | ||||
| 		$gid = self::getIdByName($uid, $name); | ||||
| 
 | ||||
| 		$return = self::removeMember($gid, $cid); | ||||
| 
 | ||||
| 		return $return; | ||||
| 	} | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Returns the combined list of contact ids from a group id list | ||||
| 	 * | ||||
|  |  | |||
|  | @ -38,16 +38,8 @@ class Type | |||
| 	const MAIL = 16; | ||||
| 	/** @var int Notification about a friend suggestion */ | ||||
| 	const SUGGEST = 32; | ||||
| 	/** @var int Unknown Notification | ||||
| 	 * @deprecated | ||||
| 	 */ | ||||
| 	const PROFILE = 64; | ||||
| 	/** @var int Notification about being tagged in a post */ | ||||
| 	const TAG_SELF = 128; | ||||
| 	/** @var int Notification about being tagged | ||||
| 	 * @deprecated | ||||
| 	 */ | ||||
| 	const TAG_SHARE = 256; | ||||
| 	/** @var int Notification about getting poked/prodded/etc. */ | ||||
| 	const POKE = 512; | ||||
| 	/** @var int Notification about either a contact had posted something directly or the contact is a mentioned forum */ | ||||
|  |  | |||
|  | @ -499,26 +499,6 @@ class User | |||
| 		return $default_group; | ||||
| 	} | ||||
| 
 | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Authenticate a user with a clear text password | ||||
| 	 * | ||||
| 	 * @param mixed  $user_info | ||||
| 	 * @param string $password | ||||
| 	 * @param bool   $third_party | ||||
| 	 * @return int|boolean | ||||
| 	 * @deprecated since version 3.6 | ||||
| 	 * @see        User::getIdFromPasswordAuthentication() | ||||
| 	 */ | ||||
| 	public static function authenticate($user_info, $password, $third_party = false) | ||||
| 	{ | ||||
| 		try { | ||||
| 			return self::getIdFromPasswordAuthentication($user_info, $password, $third_party); | ||||
| 		} catch (Exception $ex) { | ||||
| 			return false; | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Authenticate a user with a clear text password | ||||
| 	 * | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue