Fix PHP 7.0 Coding Standards
This commit is contained in:
parent
83cb4edc36
commit
965cd8b096
|
@ -1186,12 +1186,12 @@ function api_statuses_update($type)
|
||||||
INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN
|
INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN
|
||||||
(SELECT `resource-id` FROM `photo` WHERE `id` = ?) AND `photo`.`uid` = ?
|
(SELECT `resource-id` FROM `photo` WHERE `id` = ?) AND `photo`.`uid` = ?
|
||||||
ORDER BY `photo`.`width` DESC LIMIT 2", $id, api_user()));
|
ORDER BY `photo`.`width` DESC LIMIT 2", $id, api_user()));
|
||||||
|
|
||||||
if (!empty($media)) {
|
if (!empty($media)) {
|
||||||
$ressources[] = $media[0]['resource-id'];
|
$ressources[] = $media[0]['resource-id'];
|
||||||
$phototypes = Images::supportedTypes();
|
$phototypes = Images::supportedTypes();
|
||||||
$ext = $phototypes[$media[0]['type']];
|
$ext = $phototypes[$media[0]['type']];
|
||||||
|
|
||||||
$attachment = ['type' => Post\Media::IMAGE, 'mimetype' => $media[0]['type'],
|
$attachment = ['type' => Post\Media::IMAGE, 'mimetype' => $media[0]['type'],
|
||||||
'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext,
|
'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext,
|
||||||
'size' => $media[0]['datasize'],
|
'size' => $media[0]['datasize'],
|
||||||
|
@ -1199,7 +1199,7 @@ function api_statuses_update($type)
|
||||||
'description' => $media[0]['desc'] ?? '',
|
'description' => $media[0]['desc'] ?? '',
|
||||||
'width' => $media[0]['width'],
|
'width' => $media[0]['width'],
|
||||||
'height' => $media[0]['height']];
|
'height' => $media[0]['height']];
|
||||||
|
|
||||||
if (count($media) > 1) {
|
if (count($media) > 1) {
|
||||||
$attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext;
|
$attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext;
|
||||||
$attachment['preview-width'] = $media[1]['width'];
|
$attachment['preview-width'] = $media[1]['width'];
|
||||||
|
|
|
@ -326,7 +326,7 @@ function settings_post(App $a)
|
||||||
$detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0);
|
$detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0);
|
||||||
|
|
||||||
$notify_ignored = (($_POST['notify_ignored'] == 1) ? 1 : 0);
|
$notify_ignored = (($_POST['notify_ignored'] == 1) ? 1 : 0);
|
||||||
|
|
||||||
$notify = 0;
|
$notify = 0;
|
||||||
|
|
||||||
if (!empty($_POST['notify1'])) {
|
if (!empty($_POST['notify1'])) {
|
||||||
|
|
|
@ -158,4 +158,4 @@ function unfollow_process(string $url)
|
||||||
}
|
}
|
||||||
|
|
||||||
DI::baseUrl()->redirect($return_path);
|
DI::baseUrl()->redirect($return_path);
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,4 +43,4 @@ function update_notes_content(App $a) {
|
||||||
$text = notes_content($a, $profile_uid);
|
$text = notes_content($a, $profile_uid);
|
||||||
|
|
||||||
System::htmlUpdateExit($text);
|
System::htmlUpdateExit($text);
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,8 +127,8 @@ class TagCloud
|
||||||
private static function tagCalc(array $arr)
|
private static function tagCalc(array $arr)
|
||||||
{
|
{
|
||||||
$tags = [];
|
$tags = [];
|
||||||
$min = 1e9;
|
$min = 1000000000.0;
|
||||||
$max = -1e9;
|
$max = -1000000000.0;
|
||||||
$x = 0;
|
$x = 0;
|
||||||
|
|
||||||
if (!$arr) {
|
if (!$arr) {
|
||||||
|
@ -145,7 +145,7 @@ class TagCloud
|
||||||
}
|
}
|
||||||
|
|
||||||
usort($tags, 'self::tagsSort');
|
usort($tags, 'self::tagsSort');
|
||||||
$range = max(.01, $max - $min) * 1.0001;
|
$range = max(0.01, $max - $min) * 1.0001;
|
||||||
|
|
||||||
for ($x = 0; $x < count($tags); $x ++) {
|
for ($x = 0; $x < count($tags); $x ++) {
|
||||||
$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
|
$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
|
||||||
|
|
|
@ -43,7 +43,7 @@ class Attach extends BaseModule
|
||||||
|
|
||||||
// @TODO: Replace with parameter from router
|
// @TODO: Replace with parameter from router
|
||||||
$item_id = intval($a->argv[1]);
|
$item_id = intval($a->argv[1]);
|
||||||
|
|
||||||
// Check for existence
|
// Check for existence
|
||||||
$item = MAttach::exists(['id' => $item_id]);
|
$item = MAttach::exists(['id' => $item_id]);
|
||||||
if ($item === false) {
|
if ($item === false) {
|
||||||
|
|
|
@ -70,7 +70,7 @@ class HTTPRequest implements IHTTPRequest
|
||||||
*
|
*
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public function get(string $url, array $opts = [], int &$redirects = 0)
|
public function get(string $url, array $opts = [], &$redirects = 0)
|
||||||
{
|
{
|
||||||
$stamp1 = microtime(true);
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
|
@ -222,7 +222,7 @@ class HTTPRequest implements IHTTPRequest
|
||||||
*
|
*
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0)
|
public function post(string $url, $params, array $headers = [], int $timeout = 0, &$redirects = 0)
|
||||||
{
|
{
|
||||||
$stamp1 = microtime(true);
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
|
@ -447,7 +447,7 @@ class HTTPRequest implements IHTTPRequest
|
||||||
*
|
*
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
|
public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0)
|
||||||
{
|
{
|
||||||
$ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects);
|
$ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects);
|
||||||
|
|
||||||
|
@ -461,7 +461,7 @@ class HTTPRequest implements IHTTPRequest
|
||||||
*
|
*
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
|
public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0)
|
||||||
{
|
{
|
||||||
return $this->get(
|
return $this->get(
|
||||||
$url,
|
$url,
|
||||||
|
|
|
@ -114,7 +114,8 @@ class Status extends BaseDataTransferObject
|
||||||
$this->visibility = $visibility[$item['private']];
|
$this->visibility = $visibility[$item['private']];
|
||||||
|
|
||||||
$languages = json_decode($item['language'], true);
|
$languages = json_decode($item['language'], true);
|
||||||
$this->language = is_array($languages) ? array_key_first($languages) : null;
|
reset($languages);
|
||||||
|
$this->language = is_array($languages) ? key($languages) : null;
|
||||||
|
|
||||||
$this->uri = $item['uri'];
|
$this->uri = $item['uri'];
|
||||||
$this->url = $item['plink'] ?? null;
|
$this->url = $item['plink'] ?? null;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user