friendica
/
dir
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #56 from MrPetovan/master 

Fix PHP 7 Warning about count()
This commit is contained in:
Tobias Diekershoff 2018-07-11 07:42:07 +02:00 committed by GitHub
parent b384f838da 95be3462ac
commit b26995a78b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 114 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
include/Photo.php
View File

@ -1,188 +1,188 @@
<?php
if(! class_exists("Photo")) {
class Photo {
class Photo
{
private $image;
private $width;
private $height;
public function __construct($data) {
public function __construct($data)
{
$this->image = @imagecreatefromstring($data);
if($this->image !== FALSE) {
$this->width = imagesx($this->image);
if ($this->image !== FALSE) {
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
}
public function __destruct() {
if($this->image)
public function __destruct()
{
if ($this->image) {
imagedestroy($this->image);
}
}
public function getWidth() {
public function getWidth()
{
return $this->width;
}
public function getHeight() {
public function getHeight()
{
return $this->height;
}
public function getImage() {
public function getImage()
{
return $this->image;
}
public function scaleImage($max) {
public function scaleImage($max)
{
$width = $this->width;
$height = $this->height;
$dest_width = $dest_height = 0;
if((! $width)|| (! $height))
if ((!$width) || (!$height)) {
return FALSE;
}
if($width > $max && $height > $max) {
if($width > $height) {
if ($width > $max && $height > $max) {
if ($width > $height) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
else {
} else {
$dest_width = intval(( $width * $max ) / $height);
$dest_height = $max;
}
}
else {
if( $width > $max ) {
} else {
if ($width > $max) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
else {
if( $height > $max ) {
} else {
if ($height > $max) {
$dest_width = intval(( $width * $max ) / $height);
$dest_height = $max;
}
else {
} else {
$dest_width = $width;
$dest_height = $height;
}
}
}
$dest = imagecreatetruecolor( $dest_width, $dest_height );
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
if($this->image)
$dest = imagecreatetruecolor($dest_width, $dest_height);
if ($this->image) {
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
imagedestroy($this->image);
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function scaleImageUp($min) {
public function scaleImageUp($min)
{
$width = $this->width;
$height = $this->height;
$dest_width = $dest_height = 0;
if((! $width)|| (! $height))
if ((!$width) || (!$height)) {
return FALSE;
}
if($width < $min && $height < $min) {
if($width > $height) {
if ($width < $min && $height < $min) {
if ($width > $height) {
$dest_width = $min;
$dest_height = intval(( $height * $min ) / $width);
}
else {
} else {
$dest_width = intval(( $width * $min ) / $height);
$dest_height = $min;
}
}
else {
if( $width < $min ) {
} else {
if ($width < $min) {
$dest_width = $min;
$dest_height = intval(( $height * $min ) / $width);
}
else {
if( $height < $min ) {
} else {
if ($height < $min) {
$dest_width = intval(( $width * $min ) / $height);
$dest_height = $min;
}
else {
} else {
$dest_width = $width;
$dest_height = $height;
}
}
}
$dest = imagecreatetruecolor( $dest_width, $dest_height );
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
if($this->image)
$dest = imagecreatetruecolor($dest_width, $dest_height);
if ($this->image) {
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function scaleImageSquare($dim) {
$dest = imagecreatetruecolor( $dim, $dim );
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
if($this->image)
imagedestroy($this->image);
$this->image = $dest;
$this->width = imagesx($this->image);
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function cropImage($max,$x,$y,$w,$h) {
$dest = imagecreatetruecolor( $max, $max );
imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
if($this->image)
public function scaleImageSquare($dim)
{
$dest = imagecreatetruecolor($dim, $dim);
if ($this->image) {
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function saveImage($path) {
imagejpeg($this->image,$path,100);
public function cropImage($max, $x, $y, $w, $h)
{
$dest = imagecreatetruecolor($max, $max);
if ($this->image) {
imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function imageString() {
public function saveImage($path)
{
imagejpeg($this->image, $path, 100);
}
public function imageString()
{
ob_start();
imagejpeg($this->image,NULL,100);
imagejpeg($this->image, NULL, 100);
$s = ob_get_contents();
ob_end_clean();
return $s;
}
public function store($profile_id) {
public function store($profile_id)
{
$r = q("SELECT `id` FROM `photo` WHERE `profile-id` = %d LIMIT 1",
intval($profile_id)
);
if(count($r)) {
$r = q("UPDATE `photo` SET `data` = '%s' WHERE `id` = %d LIMIT 1",
if (is_array($r) && count($r)) {
q("UPDATE `photo` SET `data` = '%s' WHERE `id` = %d LIMIT 1",
dbesc($this->imageString()),
intval($r[0]['id'])
);
}
else {
$r = q("INSERT INTO `photo`
( `profile-id`, `data` ) VALUES ( %d , '%s') ",
} else {
q("INSERT INTO `photo`
( `profile-id`, `data` ) VALUES ( %d , '%s') ",
intval($profile_id),
dbesc($this->imageString())
dbesc($this->imageString())
);
}
}
}}
}

2
include/cron_maintain.php
View File

@ -29,7 +29,7 @@ WHERE `updated` < '%s'",
dbesc(date('Y-m-d H:i:s', time() - $a->config['maintenance']['min_scrape_delay']))
);
$maintenance_backlog = 'unknown';
if (count($res)) {
if (is_array($res) && count($res)) {
$maintenance_backlog = $res[0]['count'] . ' entries left';
}

2
include/submit.php
View File

@ -45,7 +45,7 @@ function run_submit($url)
}
//Remove duplicates.
if (count($r) > 1) {
if (is_array($r) && count($r) > 1) {
for ($i = 1; $i < count($r); $i++) {
logger('Removed duplicate profile ' . intval($r[$i]['id']));
q("DELETE FROM `photo` WHERE `profile-id` = %d LIMIT 1",

36
include/sync.php
View File

@ -51,10 +51,10 @@ function sync_mark($url)
$exists = count(q("SELECT * FROM `sync-timestamps` WHERE `url`='%s'", dbesc($url)));
if (!$exists) {
q("INSERT INTO `sync-timestamps` (`url`, `modified`) VALUES ('%s', NOW())", dbesc($url));
} else {
if (is_array($exists) && count($exists)) {
q("UPDATE `sync-timestamps` SET `modified`=NOW() WHERE `url`='%s'", dbesc($url));
} else {
q("INSERT INTO `sync-timestamps` (`url`, `modified`) VALUES ('%s', NOW())", dbesc($url));
}
}
@ -86,7 +86,9 @@ function push_worker($target, $batch)
*/
function get_push_targets()
{
return q("SELECT * FROM `sync-targets` WHERE `push`=b'1'");
$res = q("SELECT * FROM `sync-targets` WHERE `push`=b'1'");
return is_array($res) ? $res : [];
}
/**
@ -96,7 +98,9 @@ function get_push_targets()
*/
function get_push_batch(App $a)
{
return q("SELECT * FROM `sync-push-queue` ORDER BY `id` LIMIT %u", intval($a->config['syncing']['max_push_items']));
$res = q("SELECT * FROM `sync-push-queue` ORDER BY `id` LIMIT %u", intval($a->config['syncing']['max_push_items']));
return is_array($res) ? $res : [];
}
/**
@ -116,13 +120,12 @@ function get_pushing_job(App $a)
if (!count($targets)) {
msg('Pushing enabled, but no push targets.');
$batch = array();
}
//If we have targets, get our batch.
else {
} else {
//If we have targets, get our batch.
$batch = get_push_batch($a);
if (!count($batch))
if (!count($batch)) {
msg('Empty pushing queue.'); //No batch, means no work.
}
}
} else {
//No pushing if it's disabled.
@ -226,8 +229,11 @@ function run_pushing_job($targets, $batch, $db_host, $db_user, $db_pass, $db_dat
function get_queued_pull_batch(App $a)
{
//Randomize this, to prevent scraping the same servers too much or dead URL's.
$batch = q("SELECT * FROM `sync-pull-queue` ORDER BY RAND() LIMIT %u", intval($a->config['syncing']['max_pull_items']));
$res = q("SELECT * FROM `sync-pull-queue` ORDER BY RAND() LIMIT %u", intval($a->config['syncing']['max_pull_items']));
$batch = is_array($res) ? $res : [];
msg(sprintf('Pulling %u items from queue.', count($batch)));
return $batch;
}
@ -237,7 +243,9 @@ function get_queued_pull_batch(App $a)
*/
function get_pull_targets()
{
return q("SELECT * FROM `sync-targets` WHERE `pull`=b'1'");
$res = q("SELECT * FROM `sync-targets` WHERE `pull`=b'1'");
return is_array($res) ? $res : [];
}
/**
@ -325,6 +333,8 @@ function get_pulling_job(App $a)
if (count($batch)) {
return $batch;
}
return [];
}
/**
@ -377,7 +387,7 @@ function pull_worker($i, $threadc, $pull_batch, $db_host, $db_user, $db_pass, $d
* @param mixed $install Maybe a boolean.
* @return void
*/
function run_pulling_job(App $a, $pull_batch, $db_host, $db_user, $db_pass, $db_data, $install)
function run_pulling_job(App $a, array $pull_batch, $db_host, $db_user, $db_pass, $db_data, $install)
{
//We need the scraper.
require_once 'include/submit.php';