diff --git a/curweather/curweather.php b/curweather/curweather.php index 9aa8584a..e5e2710d 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -29,10 +29,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti $now = new DateTime(); if (!is_null($cached)) { - $cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last'); + $cdate = (int) DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last'); $cached = unserialize($cached); - if ($cdate + $cachetime > $now->getTimestamp()) { + if ($cdate + (int) $cachetime > $now->getTimestamp()) { return $cached; } } diff --git a/js_upload/file-uploader/server/php.php b/js_upload/file-uploader/server/php.php index 2248c8f0..ff485dec 100644 --- a/js_upload/file-uploader/server/php.php +++ b/js_upload/file-uploader/server/php.php @@ -77,10 +77,10 @@ class qqFileUploader { public function __construct(array $allowedExtensions = [], $sizeLimit = 10485760) { $allowedExtensions = array_map('strtolower', $allowedExtensions); - + $this->allowedExtensions = $allowedExtensions; $this->sizeLimit = $sizeLimit; - + $this->checkServerSettings(); if (isset($_GET['qqfile'])) { @@ -88,7 +88,7 @@ class qqFileUploader { } elseif (isset($_FILES['qqfile'])) { $this->file = new qqUploadedFileForm(); } else { - $this->file = false; + $this->file = false; } } @@ -105,7 +105,7 @@ class qqFileUploader { private function toBytes(string $str): int { - $val = trim($str); + $val = (int) trim($str); $last = strtolower($str[strlen($str) - 1]); switch($last) { diff --git a/membersince/membersince.php b/membersince/membersince.php index f8128eb7..20e41ac9 100644 --- a/membersince/membersince.php +++ b/membersince/membersince.php @@ -7,7 +7,6 @@ * Status: Unsupported */ -use Friendica\App; use Friendica\Core\Hook; use Friendica\DI; use Friendica\Util\DateTimeFormat; @@ -19,7 +18,7 @@ function membersince_install() function membersince_display(array &$b) { - if (DI::app()->getCurrentTheme() == 'frio') { + if (DI::appHelper()->getCurrentTheme() == 'frio') { // Works in Frio. $doc = new DOMDocument(); $doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8')); @@ -39,7 +38,7 @@ function membersince_display(array &$b) $label->setAttribute('class', 'col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted'); // The div for the register date of the profile owner. - $entry = $doc->createElement('div', DateTimeFormat::local(DI::app()->profile['register_date'])); + $entry = $doc->createElement('div', DateTimeFormat::local(DI::appHelper()->profile['register_date'])); $entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry'); $div->appendChild($hr); @@ -50,6 +49,6 @@ function membersince_display(array &$b) $b = $doc->saveHTML(); } else { // Works in Vier. - $b = preg_replace('/<\/dl>/', "\n\n\n