X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FAttach.php;h=758d3ae831c51ba112280a5f6fa49e8acd86e741;hb=7613704d2fa7d81688e697791c2e648f13f7616e;hp=48b034e4992d7a20f76fd04dd3170414234e2afe;hpb=906b7841d46db7a7e57cdb5e76f0d0d6a40b8b14;p=friendica.git

diff --git a/src/Model/Attach.php b/src/Model/Attach.php
index 48b034e499..758d3ae831 100644
--- a/src/Model/Attach.php
+++ b/src/Model/Attach.php
@@ -7,13 +7,15 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
-use Friendica\Core\System;
 use Friendica\Core\StorageManager;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
-use Friendica\Util\Security;
+use Friendica\Model\Storage\IStorage;
+use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
+use Friendica\Util\Security;
 
 /**
  * Class to handle attach dabatase table
@@ -25,46 +27,48 @@ class Attach extends BaseObject
 	 * @brief Return a list of fields that are associated with the attach table
 	 *
 	 * @return array field list
+	 * @throws \Exception
 	 */
 	private static function getFields()
 	{
-		$allfields = DBStructure::definition(false);
+		$allfields = DBStructure::definition(self::getApp()->getBasePath(), false);
 		$fields = array_keys($allfields['attach']['fields']);
 		array_splice($fields, array_search('data', $fields), 1);
 		return $fields;
 	}
 
 	/**
-	 * @brief Select rows from the attach table
+	 * @brief Select rows from the attach table and return them as array
 	 *
-	 * @param array  $fields     Array of selected fields, empty for all
-	 * @param array  $conditions Array of fields for conditions
-	 * @param array  $params     Array of several parameters
+	 * @param array $fields     Array of selected fields, empty for all
+	 * @param array $conditions Array of fields for conditions
+	 * @param array $params     Array of several parameters
 	 *
 	 * @return boolean|array
 	 *
-	 * @see \Friendica\Database\DBA::select
+	 * @throws \Exception
+	 * @see   \Friendica\Database\DBA::selectToArray
 	 */
-	public static function select(array $fields = [], array $conditions = [], array $params = [])
+	public static function selectToArray(array $fields = [], array $conditions = [], array $params = [])
 	{
 		if (empty($fields)) {
-			$selected = self::getFields();
+			$fields = self::getFields();
 		}
 
-		$r = DBA::select('attach', $fields, $conditions, $params);
-		return DBA::toArray($r);
+		$r = DBA::selectToArray('attach', $fields, $conditions, $params);
 	}
 
 	/**
 	 * @brief Retrieve a single record from the attach table
 	 *
-	 * @param array  $fields     Array of selected fields, empty for all
-	 * @param array  $conditions Array of fields for conditions
-	 * @param array  $params     Array of several parameters
+	 * @param array $fields     Array of selected fields, empty for all
+	 * @param array $conditions Array of fields for conditions
+	 * @param array $params     Array of several parameters
 	 *
 	 * @return bool|array
 	 *
-	 * @see \Friendica\Database\DBA::select
+	 * @throws \Exception
+	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function selectFirst(array $fields = [], array $conditions = [], array $params = [])
 	{
@@ -78,9 +82,10 @@ class Attach extends BaseObject
 	/**
 	 * @brief Check if attachment with given conditions exists
 	 *
-	 * @param array   $conditions  Array of extra conditions
+	 * @param array $conditions Array of extra conditions
 	 *
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function exists(array $conditions)
 	{
@@ -89,12 +94,13 @@ class Attach extends BaseObject
 
 	/**
 	 * @brief Retrive a single record given the ID
-	 * 
-	 * @param int  $id  Row id of the record
-	 * 
+	 *
+	 * @param int $id Row id of the record
+	 *
 	 * @return bool|array
 	 *
-	 * @see \Friendica\Database\DBA::select
+	 * @throws \Exception
+	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function getById($id)
 	{
@@ -102,13 +108,14 @@ class Attach extends BaseObject
 	}
 
 	/**
-	 * @brief Retrive a single record given the ID 
-	 * 
-	 * @param int  $id  Row id of the record
-	 * 
+	 * @brief Retrive a single record given the ID
+	 *
+	 * @param int $id Row id of the record
+	 *
 	 * @return bool|array
 	 *
-	 * @see \Friendica\Database\DBA::select
+	 * @throws \Exception
+	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function getByIdWithPermission($id)
 	{
@@ -131,10 +138,11 @@ class Attach extends BaseObject
 
 	/**
 	 * @brief Get file data for given row id. null if row id does not exist
-	 * 
-	 * @param array  $item  Attachment data. Needs at least 'id', 'backend-class', 'backend-ref'
-	 * 
+	 *
+	 * @param array $item Attachment data. Needs at least 'id', 'backend-class', 'backend-ref'
+	 *
 	 * @return string  file data
+	 * @throws \Exception
 	 */
 	public static function getData($item)
 	{
@@ -155,7 +163,7 @@ class Attach extends BaseObject
 	/**
 	 * @brief Store new file metadata in db and binary in default backend
 	 *
-	 * @param string  $data  Binary data
+	 * @param string  $data      Binary data
 	 * @param integer $uid       User ID
 	 * @param string  $filename  Filename
 	 * @param string  $filetype  Mimetype. optional, default = ''
@@ -166,8 +174,9 @@ class Attach extends BaseObject
 	 * @param string  $deny_gid  Permissions, denied greoup.optional, default = ''
 	 *
 	 * @return boolean/integer Row id on success, False on errors
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function store($data, $uid, $filename, $filetype = '' , $filesize = null, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
+	public static function store($data, $uid, $filename, $filetype = '' , $filesize = null, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
 	{
 		if ($filetype === '') {
 			$filetype = Mimetype::getContentType($filename);
@@ -177,6 +186,7 @@ class Attach extends BaseObject
 			$filesize = strlen($data);
 		}
 
+		/** @var IStorage $backend_class */
 		$backend_class = StorageManager::getBackend();
 		$backend_ref = '';
 		if ($backend_class !== '') {
@@ -214,9 +224,17 @@ class Attach extends BaseObject
 	/**
 	 * @brief Store new file metadata in db and binary in default backend from existing file
 	 *
+	 * @param        $src
+	 * @param        $uid
+	 * @param string $filename
+	 * @param string $allow_cid
+	 * @param string $allow_gid
+	 * @param string $deny_cid
+	 * @param string $deny_gid
 	 * @return boolean True on success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function storeFile($src, $uid, $filename = '', $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
+	public static function storeFile($src, $uid, $filename = '', $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
 	{
 		if ($filename === '') {
 			$filename = basename($src);
@@ -224,7 +242,7 @@ class Attach extends BaseObject
 
 		$data = @file_get_contents($src);
 
-		return 	self::store($data, $uid, $filename, '', null, $allow_cid, $allow_gid,  $deny_cid, $deny_gid);
+		return self::store($data, $uid, $filename, '', null, $allow_cid, $allow_gid,  $deny_cid, $deny_gid);
 	}
 
 
@@ -233,25 +251,27 @@ class Attach extends BaseObject
 	 *
 	 * @param array         $fields     Contains the fields that are updated
 	 * @param array         $conditions Condition array with the key values
-	 * @param string        $data       File data to update. Optional, default null.
+	 * @param Image         $img        Image data to update. Optional, default null.
 	 * @param array|boolean $old_fields Array with the old field values that are about to be replaced (true = update on duplicate)
 	 *
-	 * @return boolean  Was the update successfull?
+	 * @return boolean  Was the update successful?
 	 *
-	 * @see \Friendica\Database\DBA::update
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @see   \Friendica\Database\DBA::update
 	 */
-	public static function update($fields, $conditions, $img = null, array $old_fields = [])
+	public static function update($fields, $conditions, Image $img = null, array $old_fields = [])
 	{
-		if (!is_null($data)) {
+		if (!is_null($img)) {
 			// get items to update
-			$items = self::select(['backend-class','backend-ref'], $conditions);
+			$items = self::selectToArray(['backend-class','backend-ref'], $conditions);
 
 			foreach($items as $item) {
+				/** @var IStorage $backend_class */
 				$backend_class = (string)$item['backend-class'];
 				if ($backend_class !== '') {
 					$fields['backend-ref'] = $backend_class::put($img->asString(), $item['backend-ref']);
 				} else {
-					$fields['data'] = $data;
+					$fields['data'] = $img->asString();
 				}
 			}
 		}
@@ -265,19 +285,21 @@ class Attach extends BaseObject
 	/**
 	 * @brief Delete info from table and data from storage
 	 *
-	 * @param array  $conditions  Field condition(s)
-	 * @param array  $options     Options array, Optional
+	 * @param array $conditions Field condition(s)
+	 * @param array $options    Options array, Optional
 	 *
 	 * @return boolean
 	 *
-	 * @see \Friendica\Database\DBA::delete
+	 * @throws \Exception
+	 * @see   \Friendica\Database\DBA::delete
 	 */
 	public static function delete(array $conditions, array $options = [])
 	{
 		// get items to delete data info
-		$items = self::select(['backend-class','backend-ref'], $conditions);
+		$items = self::selectToArray(['backend-class','backend-ref'], $conditions);
 
 		foreach($items as $item) {
+			/** @var IStorage $backend_class */
 			$backend_class = (string)$item['backend-class'];
 			if ($backend_class !== '') {
 				$backend_class::delete($item['backend-ref']);