X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGContact.php;h=43375b9afb6692bc82d32f01ef837123aca701e1;hb=08da1ed038c9b193ded0ca70b3b1c1085bb7e90a;hp=1fed1fc3ef5b8464f521814dc99b3976b17a9ec9;hpb=320c986e0533ce1dc32f9a9039b6ae11f9420327;p=friendica.git

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 1fed1fc3ef..43375b9afb 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -19,8 +19,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class handles GlobalContact related functions
  */
@@ -33,6 +31,7 @@ class GContact
 	 * @param string $mode   Search mode (e.g. "community")
 	 *
 	 * @return array with search results
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function searchByName($search, $mode = '')
 	{
@@ -93,6 +92,7 @@ class GContact
 	 * @param integer $cid  Contact ID
 	 * @param integer $zcid Global Contact ID
 	 * @return void
+	 * @throws Exception
 	 */
 	public static function link($gcid, $uid = 0, $cid = 0, $zcid = 0)
 	{
@@ -107,16 +107,16 @@ class GContact
 	/**
 	 * @brief Sanitize the given gcontact data
 	 *
-	 * @param array $gcontact array with gcontact data
-	 * @throw Exception
-	 *
 	 * Generation:
 	 *  0: No definition
 	 *  1: Profiles on this server
 	 *  2: Contacts of profiles on this server
 	 *  3: Contacts of contacts of profiles on this server
 	 *  4: ...
+	 *
+	 * @param array $gcontact array with gcontact data
 	 * @return array $gcontact
+	 * @throws Exception
 	 */
 	public static function sanitize($gcontact)
 	{
@@ -242,6 +242,7 @@ class GContact
 	 * @param integer $uid id
 	 * @param integer $cid id
 	 * @return integer
+	 * @throws Exception
 	 */
 	public static function countCommonFriends($uid, $cid)
 	{
@@ -269,6 +270,7 @@ class GContact
 	 * @param integer $uid  id
 	 * @param integer $zcid zcid
 	 * @return integer
+	 * @throws Exception
 	 */
 	public static function countCommonFriendsZcid($uid, $zcid)
 	{
@@ -295,6 +297,7 @@ class GContact
 	 * @param integer $limit   optional, default 9999
 	 * @param boolean $shuffle optional, default false
 	 * @return object
+	 * @throws Exception
 	 */
 	public static function commonFriends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false)
 	{
@@ -333,6 +336,7 @@ class GContact
 	 * @param integer $limit   optional, default 9999
 	 * @param boolean $shuffle optional, default false
 	 * @return object
+	 * @throws Exception
 	 */
 	public static function commonFriendsZcid($uid, $zcid, $start = 0, $limit = 9999, $shuffle = false)
 	{
@@ -362,6 +366,7 @@ class GContact
 	 * @param integer $uid user
 	 * @param integer $cid cid
 	 * @return integer
+	 * @throws Exception
 	 */
 	public static function countAllFriends($uid, $cid)
 	{
@@ -387,6 +392,7 @@ class GContact
 	 * @param integer $start optional, default 0
 	 * @param integer $limit optional, default 80
 	 * @return array
+	 * @throws Exception
 	 */
 	public static function allFriends($uid, $cid, $start = 0, $limit = 80)
 	{
@@ -410,10 +416,11 @@ class GContact
 	}
 
 	/**
-	 * @param object  $uid   user
+	 * @param int     $uid   user
 	 * @param integer $start optional, default 0
 	 * @param integer $limit optional, default 80
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function suggestionQuery($uid, $start = 0, $limit = 80)
 	{
@@ -517,11 +524,10 @@ class GContact
 
 	/**
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function updateSuggestions()
 	{
-		$a = get_app();
-
 		$done = [];
 
 		/// @TODO Check if it is really neccessary to poll the own server
@@ -570,6 +576,7 @@ class GContact
 	 * @param string $url Contact url
 	 *
 	 * @return string Contact url with the wanted parts
+	 * @throws Exception
 	 */
 	public static function cleanContactUrl($url)
 	{
@@ -601,6 +608,8 @@ class GContact
 	 *
 	 * @param array $contact contact array (called by reference)
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fixAlternateContactAddress(&$contact)
 	{
@@ -622,6 +631,8 @@ class GContact
 	 * @param array $contact contact array
 	 *
 	 * @return bool|int Returns false if not found, integer if contact was found
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getId($contact)
 	{
@@ -717,6 +728,8 @@ class GContact
 	 * @param array $contact contact array
 	 *
 	 * @return bool|int Returns false if not found, integer if contact was found
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function update($contact)
 	{
@@ -864,7 +877,7 @@ class GContact
 						'location' => $contact['location'], 'about' => $contact['about']];
 
 				// Don't update the birthday field if not set or invalid
-				if (empty($contact['birthday']) || ($contact['birthday'] < '0001-01-01')) {
+				if (empty($contact['birthday']) || ($contact['birthday'] <= DBA::NULL_DATE)) {
 					unset($fields['bd']);
 				}
 
@@ -881,6 +894,8 @@ class GContact
 	 *
 	 * @param string $url profile link
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateFromProbe($url)
 	{
@@ -900,7 +915,9 @@ class GContact
 	 * @brief Update the gcontact entry for a given user id
 	 *
 	 * @param int $uid User ID
-	 * @return void
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateForUser($uid)
 	{
@@ -951,7 +968,9 @@ class GContact
 	 * If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this.
 	 *
 	 * @param string $server Server address
-	 * @return void
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fetchGsUsers($server)
 	{
@@ -966,8 +985,8 @@ class GContact
 
 		$statistics = json_decode($curlResult->getBody());
 
-		if (!empty($statistics->config)) {
-			if ($statistics->config->instance_with_ssl) {
+		if (!empty($statistics->config->instance_address)) {
+			if (!empty($statistics->config->instance_with_ssl)) {
 				$server = "https://";
 			} else {
 				$server = "http://";
@@ -976,8 +995,8 @@ class GContact
 			$server .= $statistics->config->instance_address;
 
 			$hostname = $statistics->config->instance_address;
-		} elseif (!empty($statistics)) {
-			if ($statistics->instance_with_ssl) {
+		} elseif (!empty($statistics->instance_address)) {
+			if (!empty($statistics->instance_with_ssl)) {
 				$server = "https://";
 			} else {
 				$server = "http://";
@@ -1011,6 +1030,8 @@ class GContact
 	/**
 	 * @brief Asking GNU Social server on a regular base for their user data
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function discoverGsUsers()
 	{
@@ -1036,6 +1057,7 @@ class GContact
 
 	/**
 	 * @return string
+	 * @throws Exception
 	 */
 	public static function getRandomUrl()
 	{