From dd8612c39ae96f5a123b92f46b6e7d534e3c3835 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 12 Aug 2020 13:19:59 +0300 Subject: [PATCH] [Bookmark] Silence a warning when no tags in BookmarkForm --- plugins/Bookmark/forms/bookmark.php | 162 +++++++++++++++------------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/plugins/Bookmark/forms/bookmark.php b/plugins/Bookmark/forms/bookmark.php index 8a7a296ea0..cd8341addb 100644 --- a/plugins/Bookmark/forms/bookmark.php +++ b/plugins/Bookmark/forms/bookmark.php @@ -1,48 +1,39 @@ . + /** - * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2010, StatusNet, Inc. - * * Form for adding a new bookmark * - * PHP version 5 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * * @category Bookmark - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} +defined('GNUSOCIAL') || die(); /** * Form to add a new bookmark * * @category Bookmark - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class BookmarkForm extends Form { @@ -63,9 +54,14 @@ class BookmarkForm extends Form * * @return void */ - function __construct($out=null, $title=null, $url=null, $tags=null, - $description=null, $thumbnail=null) - { + public function __construct( + $out = null, + $title = null, + $url = null, + $tags = null, + $description = null, + $thumbnail = null + ) { parent::__construct($out); $this->_title = $title; @@ -80,7 +76,7 @@ class BookmarkForm extends Form * * @return int ID of the form */ - function id() + public function id() { return 'form_new_bookmark'; } @@ -90,7 +86,7 @@ class BookmarkForm extends Form * * @return string class of the form */ - function formClass() + public function formClass() { return 'form_settings ajax-notice'; } @@ -100,7 +96,7 @@ class BookmarkForm extends Form * * @return string URL of the action */ - function action() + public function action() { return common_local_url('newbookmark'); } @@ -110,67 +106,79 @@ class BookmarkForm extends Form * * @return void */ - function formData() + public function formData() { $this->out->elementStart('fieldset', array('id' => 'new_bookmark_data')); $this->out->elementStart('ul', 'form_data'); $this->li(); - $this->out->input('bookmark-url', - // TRANS: Field label on form for adding a new bookmark. - _m('LABEL','URL'), - $this->_url, - null, - 'url', - true); // HTML5 "required" attribute + $this->out->input( + 'bookmark-url', + // TRANS: Field label on form for adding a new bookmark. + _m('LABEL', 'URL'), + $this->_url, + null, + 'url', + true // HTML5 "required" attribute + ); $this->unli(); if (!empty($this->_thumbnail)) { + [$width, $height] = $this->scaleImage( + $this->_thumbnail->width, + $this->_thumbnail->height + ); - list($width, $height) = $this->scaleImage($this->_thumbnail->width, - $this->_thumbnail->height); - - $this->out->element('img', - array('src' => $this->_thumbnail->getUrl(), - 'class' => 'bookmarkform-thumbnail', - 'width' => $width, - 'height' => $height)); + $this->out->element('img', [ + 'src' => $this->_thumbnail->getUrl(), + 'class' => 'bookmarkform-thumbnail', + 'width' => $width, + 'height' => $height, + ]); } $this->li(); - $this->out->input('bookmark-title', - // TRANS: Field label on form for adding a new bookmark. - _m('LABEL','Title'), - $this->_title, - null, - 'title', - true); // HTML5 "required" attribute + $this->out->input( + 'bookmark-title', + // TRANS: Field label on form for adding a new bookmark. + _m('LABEL', 'Title'), + $this->_title, + null, + 'title', + true // HTML5 "required" attribute + ); $this->unli(); $this->li(); - $this->out->textarea('bookmark-description', - // TRANS: Field label on form for adding a new bookmark. - _m('LABEL','Notes'), - $this->_description, - null, - 'description'); + $this->out->textarea( + 'bookmark-description', + // TRANS: Field label on form for adding a new bookmark. + _m('LABEL', 'Notes'), + $this->_description, + null, + 'description' + ); $this->unli(); $this->li(); - $this->out->input('bookmark-tags', - // TRANS: Field label on form for adding a new bookmark. - _m('LABEL','Tags'), - implode(',', $this->_tags), - // TRANS: Field title on form for adding a new bookmark. - _m('Comma- or space-separated list of tags.'), - 'tags'); + $this->out->input( + 'bookmark-tags', + // TRANS: Field label on form for adding a new bookmark. + _m('LABEL', 'Tags'), + ($this->_tags ? implode(',', $this->_tags) : null), + // TRANS: Field title on form for adding a new bookmark. + _m('Comma- or space-separated list of tags.'), + 'tags' + ); $this->unli(); $this->out->elementEnd('ul'); - $toWidget = new ToSelector($this->out, - common_current_user(), - null); + $toWidget = new ToSelector( + $this->out, + common_current_user(), + null + ); $toWidget->show(); $this->out->elementEnd('fieldset'); @@ -182,13 +190,13 @@ class BookmarkForm extends Form * @return void */ - function formActions() + public function formActions() { // TRANS: Button text for action to save a new bookmark. $this->out->submit('bookmark-submit', _m('BUTTON', 'Save'), 'submit', 'submit'); } - function scaleImage($width, $height) + public function scaleImage($width, $height) { $maxwidth = common_config('thumbnail', 'width'); $maxheight = common_config('thumbnail', 'height'); @@ -196,7 +204,7 @@ class BookmarkForm extends Form if ($width > $height && $width > $maxwidth) { $height = (int) ((((float)$maxwidth)/(float)($width))*(float)$height); $width = $maxwidth; - } else if ($height > $maxheight) { + } elseif ($height > $maxheight) { $width = (int) ((((float)$maxheight)/(float)($height))*(float)$width); $height = $maxheight; }