Browse Source

Rewrites:

- converted single-line if() block to multi-line and with curly braces
- "imported" SPL classes to have unified code style
- always initialize your variables ... :-/
- added some empty lines/spaces for better readability

Signed-off-by: Roland Häder <roland@mxchange.org>
tags/2019.03^2
Roland Häder 8 months ago
parent
commit
9fa812b35d
No account linked to committer's email address

+ 8
- 4
include/api.php View File

@@ -1528,8 +1528,10 @@ function api_search($type)

if (api_user() === false || $user_info === false) { throw new ForbiddenException(); }

if (empty($_REQUEST['q'])) { throw new BadRequestException('q parameter is required.'); }
if (empty($_REQUEST['q'])) {
throw new BadRequestException('q parameter is required.');
}

$searchTerm = trim(rawurldecode($_REQUEST['q']));

$data = [];
@@ -4399,6 +4401,7 @@ function api_fr_photo_delete($type)
if (api_user() === false) {
throw new ForbiddenException();
}

// input params
$photo_id = defaults($_REQUEST, 'photo_id', null);

@@ -4407,11 +4410,12 @@ function api_fr_photo_delete($type)
if ($photo_id == null) {
throw new BadRequestException("no photo_id specified");
}

// check if photo is existing in database
$r = Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()]);
if (!$r) {
if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()])) {
throw new BadRequestException("photo not available");
}

// now we can perform on the deletion of the photo
$result = Photo::delete(['uid' => api_user(), 'resource-id' => $photo_id]);


+ 1
- 0
index.php View File

@@ -15,3 +15,4 @@ require __DIR__ . '/vendor/autoload.php';
$a = Factory\DependencyFactory::setUp('index', __DIR__, false);

$a->runFrontend();


+ 1
- 1
mod/admin.php View File

@@ -1565,7 +1565,7 @@ function admin_page_site(App $a)
$storage_form = [];
if (!is_null($storage_current_backend) && $storage_current_backend != "") {
foreach($storage_current_backend::getOptions() as $name => $info) {
foreach ($storage_current_backend::getOptions() as $name => $info) {
$type = $info[0];
$info[0] = $storage_form_prefix . '_' . $name;
$info['type'] = $type;

+ 4
- 3
src/Model/ItemDeliveryData.php View File

@@ -7,6 +7,7 @@
namespace Friendica\Model;

use Friendica\Database\DBA;
use \BadMethodCallException;

class ItemDeliveryData
{
@@ -71,7 +72,7 @@ class ItemDeliveryData
public static function insert($item_id, array $fields)
{
if (empty($item_id)) {
throw new \BadMethodCallException('Empty item_id');
throw new BadMethodCallException('Empty item_id');
}

$fields['iid'] = $item_id;
@@ -92,7 +93,7 @@ class ItemDeliveryData
public static function update($item_id, array $fields)
{
if (empty($item_id)) {
throw new \BadMethodCallException('Empty item_id');
throw new BadMethodCallException('Empty item_id');
}

if (empty($fields)) {
@@ -113,7 +114,7 @@ class ItemDeliveryData
public static function delete($item_id)
{
if (empty($item_id)) {
throw new \BadMethodCallException('Empty item_id');
throw new BadMethodCallException('Empty item_id');
}

return DBA::delete('item-delivery-data', ['iid' => $item_id]);

+ 5
- 0
src/Model/Photo.php View File

@@ -173,6 +173,8 @@ class Photo extends BaseObject
*/
public static function getImageForPhoto(array $photo)
{
$data = "";

if ($photo["backend-class"] == "") {
// legacy data storage in "data" column
$i = self::selectFirst(["data"], ["id" => $photo["id"]]);
@@ -189,6 +191,7 @@ class Photo extends BaseObject
if ($data === "") {
return null;
}

return new Image($data, $photo["type"]);
}

@@ -219,11 +222,13 @@ class Photo extends BaseObject
{
$fields = self::getFields();
$values = array_fill(0, count($fields), "");

$photo = array_combine($fields, $values);
$photo["backend-class"] = Storage\SystemResource::class;
$photo["backend-ref"] = $filename;
$photo["type"] = $mimetype;
$photo["cacheable"] = false;

return $photo;
}


+ 10
- 4
src/Model/Storage/Database.php View File

@@ -50,8 +50,14 @@ class Database implements IStorage
{
return DBA::delete('storage', ['id' => $ref]);
}
public static function getOptions() { return []; }
public static function saveOptions($data) { return []; }

public static function getOptions()
{
return [];
}

public static function saveOptions($data)
{
return [];
}
}

+ 4
- 2
src/Model/Storage/SystemResource.php View File

@@ -6,6 +6,8 @@

namespace Friendica\Model\Storage;

use \BadMethodCallException;

/**
* @brief System resource storage class
*
@@ -32,12 +34,12 @@ class SystemResource implements IStorage

public static function put($data, $filename = "")
{
throw new \BadMethodCallException();
throw new BadMethodCallException();
}

public static function delete($filename)
{
throw new \BadMethodCallException();
throw new BadMethodCallException();
}

public static function getOptions()

+ 0
- 1
src/Worker/Notifier.php View File

@@ -498,7 +498,6 @@ class Notifier
}
DBA::close($delivery_contacts_stmt);


$url_recipients = array_filter($url_recipients);
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// They are especially used for notifications to OStatus users that don't follow us.

Loading…
Cancel
Save