From adc689cb15d611c83ebb9c5aaeaa1008ec14da28 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 8 Sep 2020 12:42:51 +0300 Subject: [PATCH] Avoid use of assignments bare inside statements Either use them in a subroutine call or put parentheses around the assignment. --- actions/imsettings.php | 20 +- classes/Safe_DataObject.php | 107 +- classes/User.php | 2 +- lib/activitystreams/activity.php | 188 ++-- lib/ui/theme.php | 109 +- lib/util/formaction.php | 67 +- lib/util/util.php | 2 +- plugins/ActivityPub/ActivityPubPlugin.php | 14 +- plugins/Embed/actions/oembed.php | 8 +- plugins/Mollom/MollomPlugin.php | 1032 ++++++++++--------- plugins/OStatus/classes/Ostatus_profile.php | 5 +- plugins/Sitemap/actions/sitemap.php | 70 +- plugins/WebFinger/actions/ownerxrd.php | 45 +- scripts/console.php | 10 +- scripts/fixup_deletions.php | 46 +- 15 files changed, 934 insertions(+), 791 deletions(-) diff --git a/actions/imsettings.php b/actions/imsettings.php index 6937788b58..6e69ed782f 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -1,4 +1,19 @@ . + /** * Settings for Jabber/XMPP integration * @@ -93,7 +108,10 @@ class ImsettingsAction extends SettingsAction $this->hidden('token', common_session_token()); $this->hidden('transport', $transport); - if ($user_im_prefs = User_im_prefs::pkeyGet(['transport' => $transport, 'user_id' => $user->id])) { + if (!empty($user_im_prefs = User_im_prefs::pkeyGet([ + 'transport' => $transport, + 'user_id' => $user->id, + ]))) { $user_im_prefs_by_transport[$transport] = $user_im_prefs; $this->element('p', 'form_confirmed', $user_im_prefs->screenname); $this->element( diff --git a/classes/Safe_DataObject.php b/classes/Safe_DataObject.php index 6aed88ae1f..4473603724 100644 --- a/classes/Safe_DataObject.php +++ b/classes/Safe_DataObject.php @@ -1,23 +1,25 @@ . + /* - * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2010, StatusNet, Inc. - * - * 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 . + * @copyright 2010 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('GNUSOCIAL')) { exit(1); } +defined('GNUSOCIAL') || die(); /** * Extended DB_DataObject to improve a few things: @@ -34,7 +36,7 @@ class Safe_DataObject extends GS_DataObject * DB_DataObject doesn't do this yet by itself. */ - function __destruct() + public function __destruct() { $this->free(); if (method_exists('DB_DataObject', '__destruct')) { @@ -56,7 +58,7 @@ class Safe_DataObject extends GS_DataObject * It will still be freed properly when the original object * gets destroyed. */ - function __clone() + public function __clone() { $this->_DB_resultid = false; } @@ -70,7 +72,7 @@ class Safe_DataObject extends GS_DataObject * * @return array of variable names to include in serialization. */ - function __sleep() + public function __sleep() { $vars = array_keys(get_object_vars($this)); $skip = array('_DB_resultid', '_link_loaded'); @@ -86,7 +88,7 @@ class Safe_DataObject extends GS_DataObject * * Old cached objects may still have them. */ - function __wakeup() + public function __wakeup() { // Refers to global state info from a previous process. // Clear this out so we don't accidentally break global @@ -108,7 +110,7 @@ class Safe_DataObject extends GS_DataObject * @return mixed * @throws Exception */ - function __call($method, $params) + public function __call($method, $params) { $return = null; // Yes, that's _call with one underscore, which does the @@ -135,19 +137,18 @@ class Safe_DataObject extends GS_DataObject * @return true or PEAR:error on wrong paramenters.. or false if no file exists.. * or the array(tablename => array(column_name=>type)) if called with 1 argument.. (databasename) */ - function databaseStructure() + public function databaseStructure() { global $_DB_DATAOBJECT; - // Assignment code - - if ($args = func_get_args()) { - + if (!empty($args = func_get_args())) { if (count($args) == 1) { - // this returns all the tables and their structure.. if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { - $this->debug("Loading Generator as databaseStructure called with args",1); + $this->debug( + 'Loading Generator as databaseStructure called with args', + 1 + ); } $x = new DB_DataObject; @@ -159,13 +160,12 @@ class Safe_DataObject extends GS_DataObject class_exists('DB_DataObject_Generator') ? '' : require_once 'DB/DataObject/Generator.php'; - foreach($tables as $table) { + foreach ($tables as $table) { $y = new DB_DataObject_Generator; - $y->fillTableSchema($x->_database,$table); + $y->fillTableSchema($x->_database, $table); } return $_DB_DATAOBJECT['INI'][$x->_database]; } else { - $_DB_DATAOBJECT['INI'][$args[0]] = isset($_DB_DATAOBJECT['INI'][$args[0]]) ? $_DB_DATAOBJECT['INI'][$args[0]] + $args[1] : $args[1]; @@ -175,7 +175,6 @@ class Safe_DataObject extends GS_DataObject } return true; } - } if (!$this->_database) { $this->_connect(); @@ -190,14 +189,14 @@ class Safe_DataObject extends GS_DataObject && !empty($_DB_DATAOBJECT['CONFIG']['proxy']) ) { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { - $this->debug("Loading Generator to fetch Schema",1); + $this->debug('Loading Generator to fetch Schema', 1); } class_exists('DB_DataObject_Generator') ? '' : require_once 'DB/DataObject/Generator.php'; $x = new DB_DataObject_Generator; - $x->fillTableSchema($this->_database,$this->tableName()); + $x->fillTableSchema($this->_database, $this->tableName()); } return true; } @@ -216,7 +215,7 @@ class Safe_DataObject extends GS_DataObject if (isset($_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"])) { $schemas = is_array($_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]) ? $_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"] : - explode(PATH_SEPARATOR,$_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]); + explode(PATH_SEPARATOR, $_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]); } /* BEGIN CHANGED FROM UPSTREAM */ @@ -234,15 +233,25 @@ class Safe_DataObject extends GS_DataObject require_once 'DB/DataObject/Generator.php'; $x = new DB_DataObject_Generator; - $x->fillTableSchema($this->_database,$this->tableName()); + $x->fillTableSchema($this->_database, $this->tableName()); // should this fail!!!??? return true; } - $this->debug("Cant find database schema: {$this->_database}/{$this->tableName()} \n". - "in links file data: " . print_r($_DB_DATAOBJECT['INI'],true),"databaseStructure",5); + $this->debug( + "Can't find database schema: {$this->_database}/{$this->tableName()}\n" + . 'in links file data: ' + . print_r($_DB_DATAOBJECT['INI'], true), + 'databaseStructure', + 5 + ); // we have to die here!! - it causes chaos if we don't (including looping forever!) // Low level exception. No need for i18n as discussed with Brion. - $this->raiseError( "Unable to load schema for database and table (turn debugging up to 5 for full error message)", DB_DATAOBJECT_ERROR_INVALIDARGS, PEAR_ERROR_DIE); + $this->raiseError( + 'Unable to load schema for database and table ' + . '(turn debugging up to 5 for full error message)', + DB_DATAOBJECT_ERROR_INVALIDARGS, + PEAR_ERROR_DIE + ); return false; } @@ -268,15 +277,27 @@ class Safe_DataObject extends GS_DataObject $data = array_merge($data, parse_ini_file($ini, true)); if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { - if (!is_readable ($ini)) { - $this->debug("ini file is not readable: $ini","databaseStructure",1); + if (!is_readable($ini)) { + $this->debug( + "ini file is not readable: {$ini}", + 'databaseStructure', + 1 + ); } else { - $this->debug("Loaded ini file: $ini","databaseStructure",1); + $this->debug( + "Loaded ini file: {$ini}", + 'databaseStructure', + 1 + ); } } } else { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { - $this->debug("Missing ini file: $ini","databaseStructure",1); + $this->debug( + "Missing ini file: {$ini}", + 'databaseStructure', + 1 + ); } } } diff --git a/classes/User.php b/classes/User.php index 0a36357d0e..ceac75279e 100644 --- a/classes/User.php +++ b/classes/User.php @@ -770,7 +770,7 @@ class User extends Managed_DataObject throw new ServerException(_('Single-user mode code called when not enabled.')); } - if ($nickname = common_config('singleuser', 'nickname')) { + if (!empty($nickname = common_config('singleuser', 'nickname'))) { $user = User::getKV('nickname', $nickname); if ($user instanceof User) { return $user; diff --git a/lib/activitystreams/activity.php b/lib/activitystreams/activity.php index daf9f4b22e..97ab508a9b 100644 --- a/lib/activitystreams/activity.php +++ b/lib/activitystreams/activity.php @@ -1,36 +1,31 @@ . + /** - * StatusNet, the distributed open-source microblogging tool - * * An activity * - * PHP version 5 - * - * LICENCE: 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 Feed - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @author Zach Copley * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET')) { - exit(1); -} +defined('GNUSOCIAL') || die(); /** * An activity in the ActivityStrea.ms world @@ -42,11 +37,10 @@ if (!defined('STATUSNET')) { * 'something else' is the object. * * @category OStatus - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class Activity { @@ -113,7 +107,7 @@ class Activity * @param DOMElement $entry Atom entry to poke at * @param DOMElement $feed Atom feed, for context */ - function __construct($entry = null, $feed = null) + public function __construct($entry = null, $feed = null) { if (is_null($entry)) { return; @@ -130,14 +124,20 @@ class Activity $this->entry = $entry; $this->feed = $feed; - if ($entry->namespaceURI == Activity::ATOM && - $entry->localName == 'entry') { + if ( + $entry->namespaceURI === Activity::ATOM + && $entry->localName === 'entry' + ) { $this->_fromAtomEntry($entry, $feed); - } else if ($entry->namespaceURI == Activity::RSS && - $entry->localName == 'item') { + } elseif ( + $entry->namespaceURI === Activity::RSS + && $entry->localName === 'item' + ) { $this->_fromRssItem($entry, $feed); - } else if ($entry->namespaceURI == Activity::SPEC && - $entry->localName == 'object') { + } elseif ( + $entry->namespaceURI === Activity::SPEC + && $entry->localName === 'object' + ) { $this->_fromAtomEntry($entry, $feed); } else { // Low level exception. No need for i18n. @@ -145,7 +145,7 @@ class Activity } } - function _fromAtomEntry($entry, $feed) + public function _fromAtomEntry($entry, $feed) { $pubEl = $this->_child($entry, self::PUBLISHED, self::ATOM); @@ -191,9 +191,7 @@ class Activity $this->objects[] = new ActivityObject($entry); } - $actorEl = $this->_child($entry, self::ACTOR); - - if (!empty($actorEl)) { + if (!empty($actorEl = $this->_child($entry, self::ACTOR))) { // Standalone elements are a holdover from older // versions of ActivityStreams. Newer feeds should have this data // integrated straight into . @@ -211,22 +209,25 @@ class Activity $this->actor->id = $authorObj->id; } } - } else if ($authorEl = $this->_child($entry, self::AUTHOR, self::ATOM)) { - + } elseif (!empty($authorEl = $this->_child( + $entry, + self::AUTHOR, + self::ATOM + ))) { // An in the entry overrides any author info on // the surrounding feed. $this->actor = new ActivityObject($authorEl); - - } else if (!empty($feed) && - $subjectEl = $this->_child($feed, self::SUBJECT)) { - + } elseif ( + !empty($feed) + && !empty($subjectEl = $this->_child($feed, self::SUBJECT)) + ) { // Feed subject is used for things like groups. // Should actually possibly not be interpreted as an actor...? $this->actor = new ActivityObject($subjectEl); - - } else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR, - self::ATOM)) { - + } elseif ( + !empty($feed) + && !empty($authorEl = $this->_child($feed, self::AUTHOR, self::ATOM)) + ) { // If there's no on the entry, it's safe to assume // the containing feed's authorship info applies. $this->actor = new ActivityObject($authorEl); @@ -271,7 +272,7 @@ class Activity $this->editLink = ActivityUtils::getLink($entry, 'edit', 'application/atom+xml'); } - function _fromRssItem($item, $channel) + public function _fromRssItem($item, $channel) { $verbEl = $this->_child($item, self::VERB); @@ -288,14 +289,26 @@ class Activity $this->time = strtotime($pubDateEl->textContent); } - if ($authorEl = $this->_child($item, self::AUTHOR, self::RSS)) { + if (!empty($authorEl = $this->_child( + $item, + self::AUTHOR, + self::RSS + ))) { $this->actor = ActivityObject::fromRssAuthor($authorEl); - } else if ($dcCreatorEl = $this->_child($item, self::CREATOR, self::DC)) { + } elseif (!empty($dcCreatorEl = $this->_child( + $item, + self::CREATOR, + self::DC + ))) { $this->actor = ActivityObject::fromDcCreator($dcCreatorEl); - } else if ($posterousEl = $this->_child($item, ActivityObject::AUTHOR, ActivityObject::POSTEROUS)) { + } elseif (!empty($posterousEl = $this->_child( + $item, + ActivityObject::AUTHOR, + ActivityObject::POSTEROUS + ))) { // Special case for Posterous.com $this->actor = ActivityObject::fromPosterousAuthor($posterousEl); - } else if (!empty($channel)) { + } elseif (!empty($channel)) { $this->actor = ActivityObject::fromRssChannel($channel); } else { // No actor! @@ -347,7 +360,7 @@ class Activity * @return DOMElement Atom entry */ - function toAtomEntry() + public function toAtomEntry() { return null; } @@ -359,7 +372,7 @@ class Activity * @return array $activity */ - function asArray() + public function asArray() { $activity = array(); @@ -416,7 +429,6 @@ class Activity // Context stuff. if (!empty($this->context)) { - if (!empty($this->context->location)) { $loc = $this->context->location; @@ -528,15 +540,23 @@ class Activity return array_filter($activity); } - function asString($namespace=false, $author=true, $source=false) - { + public function asString( + $namespace = false, + $author = true, + $source = false + ) { $xs = new XMLStringer(true); $this->outputTo($xs, $namespace, $author, $source); return $xs->getString(); } - function outputTo($xs, $namespace=false, $author=true, $source=false, $tag='entry') - { + public function outputTo( + $xs, + $namespace = false, + $author = true, + $source = false, + $tag = 'entry' + ) { if ($namespace) { $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom', 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0', @@ -557,10 +577,8 @@ class Activity } if ($this->verb == ActivityVerb::POST && count($this->objects) == 1 && $tag == 'entry') { - $obj = $this->objects[0]; - $obj->outputTo($xs, null); - + $obj->outputTo($xs, null); } else { $xs->element('id', null, $this->id); @@ -582,7 +600,6 @@ class Activity 'type' => 'text/html', 'href' => $this->link)); } - } $xs->element('activity:verb', null, $this->verb); @@ -597,7 +614,7 @@ class Activity } if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') { - foreach($this->objects as $object) { + foreach ($this->objects as $object) { if ($object instanceof Activity) { $object->outputTo($xs, false, true, true, 'activity:object'); } else { @@ -607,21 +624,24 @@ class Activity } if (!empty($this->context)) { - if (!empty($this->context->replyToID)) { if (!empty($this->context->replyToUrl)) { - $xs->element('thr:in-reply-to', - array('ref' => $this->context->replyToID, - 'href' => $this->context->replyToUrl)); + $xs->element('thr:in-reply-to', [ + 'ref' => $this->context->replyToID, + 'href' => $this->context->replyToUrl, + ]); } else { - $xs->element('thr:in-reply-to', - array('ref' => $this->context->replyToID)); + $xs->element('thr:in-reply-to', [ + 'ref' => $this->context->replyToID, + ]); } } if (!empty($this->context->replyToUrl)) { - $xs->element('link', array('rel' => 'related', - 'href' => $this->context->replyToUrl)); + $xs->element('link', [ + 'rel' => 'related', + 'href' => $this->context->replyToUrl, + ]); } if (!empty($this->context->conversation)) { @@ -631,14 +651,18 @@ class Activity $convattr['href'] = $conv->getUrl(); $convattr['local_id'] = $conv->getID(); $convattr['ref'] = $conv->getUri(); - $xs->element('link', array('rel' => 'ostatus:'.ActivityContext::CONVERSATION, - 'href' => $convattr['href'])); + $xs->element('link', [ + 'rel' => 'ostatus:' . ActivityContext::CONVERSATION, + 'href' => $convattr['href'], + ]); } else { $convattr['ref'] = $this->context->conversation; } - $xs->element('ostatus:'.ActivityContext::CONVERSATION, - $convattr, - $this->context->conversation); + $xs->element( + 'ostatus:' . ActivityContext::CONVERSATION, + $convattr, + $this->context->conversation + ); /* Since we use XMLWriter we just use the previously hardcoded prefix for ostatus, otherwise we should use something like this: $xs->elementNS(array(ActivityContext::OSTATUS => 'ostatus'), // namespace @@ -649,9 +673,11 @@ class Activity } foreach ($this->context->attention as $attnURI=>$type) { - $xs->element('link', array('rel' => ActivityContext::MENTIONED, - ActivityContext::OBJECTTYPE => $type, // FIXME: undocumented - 'href' => $attnURI)); + $xs->element('link', [ + 'rel' => ActivityContext::MENTIONED, + ActivityContext::OBJECTTYPE => $type, // @fixme undocumented + 'href' => $attnURI, + ]); } if (!empty($this->context->location)) { @@ -759,7 +785,7 @@ class Activity * @param int $tm Unix timestamp * @return string */ - static function iso8601Date($tm) + public static function iso8601Date($tm) { $dateStr = date('d F Y H:i:s', $tm); $d = new DateTime($dateStr, new DateTimeZone('UTC')); diff --git a/lib/ui/theme.php b/lib/ui/theme.php index 04b52632ab..7f0f9ee172 100644 --- a/lib/ui/theme.php +++ b/lib/ui/theme.php @@ -1,36 +1,31 @@ . + /** - * StatusNet, the distributed open-source microblogging tool - * * Utilities for theme files and paths * - * PHP version 5 - * - * LICENCE: 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 Paths - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @author Sarven Capadisli * @copyright 2008-2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +defined('GNUSOCIAL') || die(); /** * Class for querying and manipulating a theme @@ -45,19 +40,18 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * This used to be a couple of functions, but for various reasons it's nice * to have a class instead. * - * @category Output - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @category Output + * @package GNUsocial + * @author Evan Prodromou + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class Theme { const FALLBACK = 'neo'; - var $name = null; - var $dir = null; - var $path = null; + public $name = null; + public $dir = null; + public $path = null; protected $metadata = null; // access via getMetadata() lazy-loader protected $externals = null; protected $deps = null; @@ -70,7 +64,7 @@ class Theme * @param string $name Name of the theme; defaults to config value * @throws ServerException */ - function __construct($name = null) + public function __construct($name = null) { if (empty($name)) { $name = common_config('site', 'theme'); @@ -107,14 +101,15 @@ class Theme // Ruh roh. Fall back to default, then. - common_log(LOG_WARNING, sprintf("Unable to find theme '%s', falling back to default theme '%s'", - $name, - Theme::FALLBACK)); + common_log(LOG_WARNING, sprintf( + 'Unable to find theme \'%s\', falling back to default theme \'%s\'', + $name, + Theme::FALLBACK + )); $this->name = Theme::FALLBACK; $this->dir = $instroot.'/'.Theme::FALLBACK; $this->path = $this->relativeThemePath('theme', 'theme', Theme::FALLBACK); - } /** @@ -135,13 +130,13 @@ class Theme $sslserver = common_config($group, 'sslserver'); if (empty($sslserver)) { - if (is_string(common_config('site', 'sslserver')) && - mb_strlen(common_config('site', 'sslserver')) > 0) { - $server = common_config('site', 'sslserver'); - } else if (common_config('site', 'server')) { + $sslserver = common_config('site', 'sslserver'); + if (is_string($sslserver) && strlen($sslserver) > 0) { + $server = $sslserver; + } elseif (!empty(common_config('site', 'server'))) { $server = common_config('site', 'server'); } - $path = common_config('site', 'path') . '/'; + $path = common_config('site', 'path') . '/'; if ($fallbackSubdir) { $path .= $fallbackSubdir . '/'; } @@ -191,7 +186,7 @@ class Theme * * @return string full pathname, like /var/www/mublog/theme/default/logo.png */ - function getFile($relative) + public function getFile($relative) { return $this->dir.'/'.$relative; } @@ -203,7 +198,7 @@ class Theme * * @return string full URL, like 'http://example.com/theme/default/logo.png' */ - function getPath($relative) + public function getPath($relative) { return $this->path.'/'.$relative; } @@ -215,7 +210,7 @@ class Theme * * @return array of strings with theme names */ - function getDeps() + public function getDeps() { if ($this->deps === null) { $chain = $this->doGetDeps(array($this->name)); @@ -238,9 +233,11 @@ class Theme array_unshift($chain, $include); return $theme->doGetDeps($chain); } catch (Exception $e) { - common_log(LOG_ERR, - "Exception while fetching theme dependencies " . - "for $this->name: " . $e->getMessage()); + common_log( + LOG_ERR, + 'Exception while fetching theme dependencies ' + . "for {$this->name}: {$e->getMessage()}" + ); } } } @@ -253,9 +250,9 @@ class Theme * * @return array associative of strings */ - function getMetadata() + public function getMetadata() { - if ($this->metadata == null) { + if (is_null($this->metadata)) { $this->metadata = $this->doGetMetadata(); } return $this->metadata; @@ -284,9 +281,9 @@ class Theme * @return array of URL strings * @throws ServerException */ - function getExternals() + public function getExternals() { - if ($this->externals == null) { + if (is_null($this->externals)) { $data = $this->getMetadata(); if (!empty($data['external'])) { $ext = (array)$data['external']; @@ -313,7 +310,7 @@ class Theme * @return string File path to the theme file * @throws ServerException */ - static function file($relative, $name=null) + public static function file($relative, $name = null) { $theme = new Theme($name); return $theme->getFile($relative); @@ -328,7 +325,7 @@ class Theme * @return string URL of the file * @throws ServerException */ - static function path($relative, $name=null) + public static function path($relative, $name = null) { $theme = new Theme($name); return $theme->getPath($relative); @@ -339,7 +336,7 @@ class Theme * * @return array list of available theme names */ - static function listAvailable() + public static function listAvailable() { $local = self::subdirsOf(self::localRoot()); $install = self::subdirsOf(self::installRoot()); @@ -363,7 +360,7 @@ class Theme $subdirs = array(); if (is_dir($dir)) { - if ($dh = opendir($dir)) { + if (($dh = opendir($dir)) !== false) { while (($filename = readdir($dh)) !== false) { if ($filename != '..' && $filename !== '.' && is_dir($dir.'/'.$filename)) { @@ -409,7 +406,7 @@ class Theme return $instroot; } - static function validName($name) + public static function validName($name) { return preg_match('/^[a-z0-9][a-z0-9_-]*$/i', $name); } diff --git a/lib/util/formaction.php b/lib/util/formaction.php index 0eb52ddde5..325ea09faf 100644 --- a/lib/util/formaction.php +++ b/lib/util/formaction.php @@ -1,43 +1,40 @@ . + /** * Form action extendable class. * - * PHP version 5 - * - * @category Action - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://status.net/ - * - * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2008, 2009, StatusNet, Inc. - * - * 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 Action + * @package GNUsocial + * @author Evan Prodromou + * @copyright 2008, 2009 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('GNUSOCIAL')) { exit(1); } +defined('GNUSOCIAL') || die(); /** * Form action extendable class * - * @category Action - * @package StatusNet - * @author Evan Prodromou - * @author Mikael Nordfeldth - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://status.net/ + * @category Action + * @package GNUsocial + * @author Evan Prodromou + * @author Mikael Nordfeldth + * @copyright 2008, 2009 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class FormAction extends ManagedAction { @@ -47,7 +44,8 @@ class FormAction extends ManagedAction protected $needLogin = true; protected $canPost = true; - protected function prepare(array $args = []) { + protected function prepare(array $args = []) + { parent::prepare($args); $this->form = $this->form ?: ucfirst($this->action); @@ -63,17 +61,18 @@ class FormAction extends ManagedAction return true; } - public function isReadOnly($args) { + public function isReadOnly($args) + { return !$this->isPost(); } public function showPageNotice() { $this->showInstructions(); - if ($msg = $this->getError()) { + if (!empty($msg = $this->getError())) { $this->element('div', 'error', $msg); } - if ($msg = $this->getInfo()) { + if (!empty($msg = $this->getInfo())) { $this->element('div', 'info', $msg); } } diff --git a/lib/util/util.php b/lib/util/util.php index 2f68662380..485bb977dd 100644 --- a/lib/util/util.php +++ b/lib/util/util.php @@ -2097,7 +2097,7 @@ function common_get_mime_media($type) function common_bare_mime($mimetype) { $mimetype = mb_strtolower($mimetype); - if ($semicolon = mb_strpos($mimetype, ';')) { + if (($semicolon = mb_strpos($mimetype, ';')) !== false) { $mimetype = mb_substr($mimetype, 0, $semicolon); } return trim($mimetype); diff --git a/plugins/ActivityPub/ActivityPubPlugin.php b/plugins/ActivityPub/ActivityPubPlugin.php index 75167eeae1..37725c6951 100644 --- a/plugins/ActivityPub/ActivityPubPlugin.php +++ b/plugins/ActivityPub/ActivityPubPlugin.php @@ -598,7 +598,7 @@ class ActivityPubPlugin extends Plugin if ($result === false) { common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').'); return []; - } elseif ($n_matches = count($wmatches)) { + } elseif (($n_matches = count($wmatches)) != 0) { common_debug(sprintf('Found %d matches for WebFinger IDs: %s', $n_matches, _ve($wmatches))); } return $wmatches[1]; @@ -891,10 +891,12 @@ class ActivityPubPlugin extends Plugin // Local user can be ignored } - $other = array_merge($other, + $other = array_merge( + $other, Activitypub_profile::from_profile_collection( $notice->getAttentionProfiles() - )); + ) + ); if ($notice->reply_to) { try { @@ -906,10 +908,12 @@ class ActivityPubPlugin extends Plugin // Local user can be ignored } - $other = array_merge($other, + $other = array_merge( + $other, Activitypub_profile::from_profile_collection( $parent_notice->getAttentionProfiles() - )); + ) + ); } catch (NoParentNoticeException $e) { // This is not a reply to something (has no parent) } catch (NoResultException $e) { diff --git a/plugins/Embed/actions/oembed.php b/plugins/Embed/actions/oembed.php index 14a8a51a5f..8c736aba90 100644 --- a/plugins/Embed/actions/oembed.php +++ b/plugins/Embed/actions/oembed.php @@ -115,7 +115,13 @@ class OEmbedAction extends Action // TRANS: %d is an attachment ID. $this->clientError(sprintf(_('Attachment %s not found.'), $id), 404); } - if (empty($attachment->filename) && $file_oembed = File_oembed::getKV('file_id', $attachment->id)) { + if ( + empty($attachment->filename) + && !empty($file_oembed = File_oembed::getKV( + 'file_id', + $attachment->id + )) + ) { // Proxy the existing oembed information $oembed['type']=$file_oembed->type; $oembed['provider']=$file_oembed->provider; diff --git a/plugins/Mollom/MollomPlugin.php b/plugins/Mollom/MollomPlugin.php index 1a423207f7..344bd448a2 100644 --- a/plugins/Mollom/MollomPlugin.php +++ b/plugins/Mollom/MollomPlugin.php @@ -1,55 +1,51 @@ . + /** - * Laconica, the distributed open-source microblogging tool - * * Plugin to check submitted notices with Mollom * - * PHP version 5 - * - * LICENCE: 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 . - * * Mollom is a bayesian spam checker, wrapped into a webservice * This plugin is based on the Drupal Mollom Plugin * * @category Plugin - * @package Laconica + * @package GNUsocial * @author Brenda Wallace - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * + * @copyright 2010 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET')) { - exit(1); -} +defined('GNUsocial') || die(); define('MOLLOMPLUGIN_VERSION', '0.1'); define('MOLLOM_API_VERSION', '1.0'); -define('MOLLOM_ANALYSIS_UNKNOWN' , 0); -define('MOLLOM_ANALYSIS_HAM' , 1); -define('MOLLOM_ANALYSIS_SPAM' , 2); -define('MOLLOM_ANALYSIS_UNSURE' , 3); +define('MOLLOM_ANALYSIS_UNKNOWN', 0); +define('MOLLOM_ANALYSIS_HAM', 1); +define('MOLLOM_ANALYSIS_SPAM', 2); +define('MOLLOM_ANALYSIS_UNSURE', 3); define('MOLLOM_MODE_DISABLED', 0); -define('MOLLOM_MODE_CAPTCHA' , 1); +define('MOLLOM_MODE_CAPTCHA', 1); define('MOLLOM_MODE_ANALYSIS', 2); -define('MOLLOM_FALLBACK_BLOCK' , 0); +define('MOLLOM_FALLBACK_BLOCK', 0); define('MOLLOM_FALLBACK_ACCEPT', 1); -define('MOLLOM_ERROR' , 1000); -define('MOLLOM_REFRESH' , 1100); +define('MOLLOM_ERROR', 1000); +define('MOLLOM_REFRESH', 1100); define('MOLLOM_REDIRECT', 1200); /** @@ -57,10 +53,11 @@ define('MOLLOM_REDIRECT', 1200); * * Mollom is a bayesian spam filter provided by webservice. * - * @category Plugin - * @package Laconica - * @author Brenda Wallace - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @category Plugin + * @package GNUsocial + * @author Brenda Wallace + * @copyright 2010 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later * * @see Event */ @@ -68,36 +65,38 @@ class MollomPlugin extends Plugin { public $public_key; public $private_key; - public $servers; + public $servers = null; - function onStartNoticeSave($notice) + public function onStartNoticeSave($notice) { - if ( $this->public_key ) { - //Check spam - $data = array( - 'post_body' => $notice->content, - 'author_name' => $profile->nickname, - 'author_url' => $profile->homepage, - 'author_id' => $profile->id, - 'author_ip' => $this->getClientIp(), - ); - $response = $this->mollom('mollom.checkContent', $data); - if ($response['spam'] == MOLLOM_ANALYSIS_SPAM) { - // TRANS: Client exception thrown when notice content triggers the spam filter. - throw new ClientException(_m('Spam Detected.'), 400); + if ($this->public_key) { + //Check spam + $data = [ + 'post_body' => $notice->content, + 'author_name' => $profile->nickname, + 'author_url' => $profile->homepage, + 'author_id' => $profile->id, + 'author_ip' => $this->getClientIp(), + ]; + $response = $this->mollom('mollom.checkContent', $data); + switch ($response['spam']) { + case MOLLOM_ANALYSIS_SPAM: + // TRANS: Client exception thrown when notice content triggers the spam filter. + throw new ClientException(_m('Spam Detected.'), 400); + case MOLLOM_ANALYSIS_UNSURE: + //if unsure, let through + break; + case MOLLOM_ANALYSIS_HAM: + // all good! :-) + break; + } } - if ($response['spam'] == MOLLOM_ANALYSIS_UNSURE) { - //if unsure, let through - } - if($response['spam'] == MOLLOM_ANALYSIS_HAM) { - // all good! :-) - } - } - return true; + return true; } - function getClientIP() { + public function getClientIP() + { if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { // Note: order matters here; use proxy-forwarded stuff first foreach (array('HTTP_X_FORWARDED_FOR', 'CLIENT-IP', 'REMOTE_ADDR') as $k) { @@ -114,71 +113,88 @@ class MollomPlugin extends Plugin * automatically add the information required to authenticate against * Mollom. */ - function mollom($method, $data = array()) { + public function mollom($method, $data = []) + { if (!extension_loaded('xmlrpc')) { if (!dl('xmlrpc.so')) { common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available."); } } - // Construct the server URL: - $public_key = $this->public_key; - // Retrieve the list of Mollom servers from the database: - $servers = $this->servers; + // Construct the server URL: + $public_key = $this->public_key; + // Retrieve the list of Mollom servers from the database: + $servers = $this->servers; - if ($servers == NULL) { - // Retrieve a list of valid Mollom servers from mollom.com: - $servers = $this->xmlrpc('http://xmlrpc.mollom.com/'. MOLLOM_API_VERSION, 'mollom.getServerList', $this->authentication()); + if (is_null($servers)) { + // Retrieve a list of valid Mollom servers from mollom.com: + $servers = $this->xmlrpc('http://xmlrpc.mollom.com/'. MOLLOM_API_VERSION, 'mollom.getServerList', $this->authentication()); - // Store the list of servers in the database: - // TODO! variable_set('mollom_servers', $servers); - } - - if (is_array($servers)) { - // Send the request to the first server, if that fails, try the other servers in the list: - foreach ($servers as $server) { - $auth = $this->authentication(); - $data = array_merge($data, $auth); - $result = $this->xmlrpc($server .'/'. MOLLOM_API_VERSION, $method, $data); - - // Debug output: - if (isset($data['session_id'])) { - common_debug("called $method at server $server with session ID '". $data['session_id'] ."'"); - } - else { - common_debug("called $method at server $server with no session ID"); - } - - if ($errno = $this->xmlrpc_errno()) { - common_log(LOG_ERR, sprintf('Error @errno: %s - %s - %s - 
%s
', $this->xmlrpc_errno(), $server, $this->xmlrpc_error_msg(), $method, print_r($data, TRUE))); - - if ($errno == MOLLOM_REFRESH) { - // Retrieve a list of valid Mollom servers from mollom.com: - $servers = $this->xmlrpc('http://xmlrpc.mollom.com/'. MOLLOM_API_VERSION, 'mollom.getServerList', $this->authentication()); - - // Store the updated list of servers in the database: - //tODO variable_set('mollom_servers', $servers); - } - else if ($errno == MOLLOM_ERROR) { - return $result; - } - else if ($errno == MOLLOM_REDIRECT) { - // Do nothing, we select the next client automatically. - } - - // Reset the XMLRPC error: - $this->xmlrpc_error(0); // FIXME: this is crazy. - } - else { - common_debug("Result = " . print_r($result, TRUE)); - return $result; - } + // Store the list of servers in the database: + // @todo variable_set('mollom_servers', $servers); } - } - // If none of the servers worked, activate the fallback mechanism: - common_debug("none of the servers worked"); - // _mollom_fallback(); + if (is_array($servers)) { + // Send the request to the first server, if that fails, try the other servers in the list: + foreach ($servers as $server) { + $auth = $this->authentication(); + $data = array_merge($data, $auth); + $result = $this->xmlrpc( + $server . '/' . MOLLOM_API_VERSION, + $method, + $data + ); + + // Debug output: + if (array_key_exists('session_id', $data)) { + common_debug( + "called {$method} at server {$server} with session ID " + . "'{$data['session_id']}'" + ); + } else { + common_debug( + "called {$method} at server {$server} with no session ID" + ); + } + + if (!empty($errno = $this->xmlrpc_errno())) { + common_log(LOG_ERR, sprintf( + 'Error @errno: %s - %s - %s - 
%s
', + $this->xmlrpc_errno(), + $server, + $this->xmlrpc_error_msg(), + $method, + print_r($data, true) + )); + + if ($errno === MOLLOM_REFRESH) { + // Retrieve a list of valid Mollom servers from mollom.com: + $servers = $this->xmlrpc( + 'http://xmlrpc.mollom.com/' . MOLLOM_API_VERSION, + 'mollom.getServerList', + $this->authentication() + ); + + // Store the updated list of servers in the database: + // @todo variable_set('mollom_servers', $servers); + } elseif ($errno === MOLLOM_ERROR) { + return $result; + } elseif ($errno === MOLLOM_REDIRECT) { + // Do nothing, we select the next client automatically. + } + + // Reset the XMLRPC error: + $this->xmlrpc_error(0); // FIXME: this is crazy. + } else { + common_debug('Result = ' . print_r($result, true)); + return $result; + } + } + } + + // If none of the servers worked, activate the fallback mechanism: + common_debug('none of the servers worked'); + // _mollom_fallback(); // If everything failed, we reset the server list to force Mollom to request a new list: //TODO variable_set('mollom_servers', array()); @@ -202,34 +218,27 @@ class MollomPlugin extends Plugin * Make sure your server's time is synchronized with the world clocks, * and that you don't share your private key with anyone else. */ - private function authentication() { + private function authentication() + { + $public_key = $this->public_key; + $private_key = $this->private_key; - $public_key = $this->public_key; - $private_key = $this->private_key; + $hash = hash_hmac('sha1', $private_key, $private_key, true); - // Generate a timestamp according to the dateTime format (http://www.w3.org/TR/xmlschema-2/#dateTime): - $time = gmdate("Y-m-d\TH:i:s.\\0\\0\\0O", time()); + // Store everything in an array. Elsewhere in the code, we'll add the + // acutal data before we pass it onto the XML-RPC library: + $data['public_key'] = $public_key; + $data['time'] = $time; + $data['hash'] = $hash; - // Calculate a HMAC-SHA1 according to RFC2104 (http://www.ietf.org/rfc/rfc2104.txt): - $hash = base64_encode( - pack("H*", sha1((str_pad($private_key, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) . - pack("H*", sha1((str_pad($private_key, 64, chr(0x00)) ^ (str_repeat(chr(0x36), 64))) . - $time)))) - ); - - // Store everything in an array. Elsewhere in the code, we'll add the - // acutal data before we pass it onto the XML-RPC library: - $data['public_key'] = $public_key; - $data['time'] = $time; - $data['hash'] = $hash; - - return $data; + return $data; } - function xmlrpc($url) { - //require_once './includes/xmlrpc.inc'; - $args = func_get_args(); - return call_user_func_array(array('MollomPlugin', '_xmlrpc'), $args); + public function xmlrpc($url) + { + //require_once './includes/xmlrpc.inc'; + $args = func_get_args(); + return call_user_func_array(['MollomPlugin', '_xmlrpc'], $args); } /** @@ -242,25 +251,26 @@ class MollomPlugin extends Plugin * @return * Object. */ - function xmlrpc_value($data, $type = FALSE) { - $xmlrpc_value = new stdClass(); - $xmlrpc_value->data = $data; - if (!$type) { - $type = $this->xmlrpc_value_calculate_type($xmlrpc_value); - } - $xmlrpc_value->type = $type; - if ($type == 'struct') { - // Turn all the values in the array into new xmlrpc_values - foreach ($xmlrpc_value->data as $key => $value) { - $xmlrpc_value->data[$key] = $this->xmlrpc_value($value); + public function xmlrpc_value($data, $type = false) + { + $xmlrpc_value = new stdClass(); + $xmlrpc_value->data = $data; + if (!$type) { + $type = $this->xmlrpc_value_calculate_type($xmlrpc_value); } - } - if ($type == 'array') { - for ($i = 0, $j = count($xmlrpc_value->data); $i < $j; $i++) { - $xmlrpc_value->data[$i] = $this->xmlrpc_value($xmlrpc_value->data[$i]); + $xmlrpc_value->type = $type; + if ($type === 'struct') { + // Turn all the values in the array into new xmlrpc_values + foreach ($xmlrpc_value->data as $key => $value) { + $xmlrpc_value->data[$key] = $this->xmlrpc_value($value); + } } - } - return $xmlrpc_value; + if ($type === 'array') { + for ($i = 0, $j = count($xmlrpc_value->data); $i < $j; ++$i) { + $xmlrpc_value->data[$i] = $this->xmlrpc_value($xmlrpc_value->data[$i]); + } + } + return $xmlrpc_value; } /** @@ -273,33 +283,31 @@ class MollomPlugin extends Plugin * @see * http://www.xmlrpc.com/spec#scalars */ - function xmlrpc_value_calculate_type(&$xmlrpc_value) { - // http://www.php.net/gettype: Never use gettype() to test for a certain type [...] Instead, use the is_* functions. - if (is_bool($xmlrpc_value->data)) { - return 'boolean'; - } - if (is_double($xmlrpc_value->data)) { - return 'double'; - } - if (is_int($xmlrpc_value->data)) { - return 'int'; - } - if (is_array($xmlrpc_value->data)) { - // empty or integer-indexed arrays are 'array', string-indexed arrays 'struct' - return empty($xmlrpc_value->data) || range(0, count($xmlrpc_value->data) - 1) === array_keys($xmlrpc_value->data) ? 'array' : 'struct'; - } - if (is_object($xmlrpc_value->data)) { - if ($xmlrpc_value->data->is_date) { - return 'date'; + public function xmlrpc_value_calculate_type(&$xmlrpc_value) + { + // http://www.php.net/gettype: Never use gettype() to test for a certain type [...] Instead, use the is_* functions. + if (is_bool($xmlrpc_value->data)) { + return 'boolean'; + } elseif (is_double($xmlrpc_value->data)) { + return 'double'; + } elseif (is_int($xmlrpc_value->data)) { + return 'int'; + } elseif (is_array($xmlrpc_value->data)) { + // empty or integer-indexed arrays are 'array', string-indexed arrays 'struct' + return empty($xmlrpc_value->data) + || (range(0, count($xmlrpc_value->data) - 1) === array_keys($xmlrpc_value->data) ? 'array' : 'struct'); } - if ($xmlrpc_value->data->is_base64) { - return 'base64'; + if (is_object($xmlrpc_value->data)) { + if ($xmlrpc_value->data->is_date) { + return 'date'; + } elseif ($xmlrpc_value->data->is_base64) { + return 'base64'; + } + $xmlrpc_value->data = get_object_vars($xmlrpc_value->data); + return 'struct'; } - $xmlrpc_value->data = get_object_vars($xmlrpc_value->data); - return 'struct'; - } - // default - return 'string'; + // default + return 'string'; } /** @@ -309,8 +317,9 @@ class MollomPlugin extends Plugin * @return * XML representation of value. */ - function xmlrpc_value_get_xml($xmlrpc_value) { - switch ($xmlrpc_value->type) { + public function xmlrpc_value_get_xml($xmlrpc_value) + { + switch ($xmlrpc_value->type) { case 'boolean': return ''. (($xmlrpc_value->data) ? '1' : '0') .''; break; @@ -326,18 +335,18 @@ class MollomPlugin extends Plugin return ''. htmlspecialchars($xmlrpc_value->data) .''; break; case 'array': - $return = ''."\n"; + $return = "\n"; foreach ($xmlrpc_value->data as $item) { - $return .= ' '. $this->xmlrpc_value_get_xml($item) ."\n"; + $return .= ' '. $this->xmlrpc_value_get_xml($item) ."\n"; } $return .= ''; return $return; break; case 'struct': - $return = ''."\n"; + $return = "\n"; foreach ($xmlrpc_value->data as $name => $value) { - $return .= " ". htmlentities($name) .""; - $return .= $this->xmlrpc_value_get_xml($value) ."\n"; + $return .= ' ' . htmlentities($name) . ''; + $return .= $this->xmlrpc_value_get_xml($value) . "\n"; } $return .= ''; return $return; @@ -349,7 +358,7 @@ class MollomPlugin extends Plugin return $this->xmlrpc_base64_get_xml($xmlrpc_value->data); break; } - return FALSE; + return false; } /** @@ -373,25 +382,31 @@ class MollomPlugin extends Plugin * An object containing the HTTP request headers, response code, headers, * data and redirect status. */ - function http_request($url, $headers = array(), $method = 'GET', $data = NULL, $retry = 3) { - global $db_prefix; + public function http_request( + $url, + $headers = [], + $method = 'GET', + $data = null, + $retry = 3 + ) { + global $db_prefix; - $result = new stdClass(); + $result = new stdClass(); - // Parse the URL and make sure we can handle the schema. - $uri = parse_url($url); + // Parse the URL and make sure we can handle the schema. + $uri = parse_url($url); - if ($uri == FALSE) { - $result->error = 'unable to parse URL'; - return $result; - } + if ($uri === false) { + $result->error = 'unable to parse URL'; + return $result; + } - if (!isset($uri['scheme'])) { - $result->error = 'missing schema'; - return $result; - } + if (!array_key_exists('scheme', $uri)) { + $result->error = 'missing schema'; + return $result; + } - switch ($uri['scheme']) { + switch ($uri['scheme']) { case 'http': $port = isset($uri['port']) ? $uri['port'] : 80; $host = $uri['host'] . ($port != 80 ? ':'. $port : ''); @@ -408,107 +423,114 @@ class MollomPlugin extends Plugin return $result; } - // Make sure the socket opened properly. - if (!$fp) { - // When a network error occurs, we use a negative number so it does not - // clash with the HTTP status codes. - $result->code = -$errno; - $result->error = trim($errstr); + // Make sure the socket opened properly. + if ($fp === false) { + // When a network error occurs, we use a negative number so it does not + // clash with the HTTP status codes. + $result->code = -$errno; + $result->error = trim($errstr); - // Mark that this request failed. This will trigger a check of the web - // server's ability to make outgoing HTTP requests the next time that - // requirements checking is performed. - // @see system_requirements() - //TODO variable_set('drupal_http_request_fails', TRUE); + // Mark that this request failed. This will trigger a check of the web + // server's ability to make outgoing HTTP requests the next time that + // requirements checking is performed. + // @see system_requirements() + // @todo variable_set('drupal_http_request_fails', TRUE); - return $result; - } - - // Construct the path to act on. - $path = isset($uri['path']) ? $uri['path'] : '/'; - if (isset($uri['query'])) { - $path .= '?'. $uri['query']; - } - - // Create HTTP request. - $defaults = array( - // RFC 2616: "non-standard ports MUST, default ports MAY be included". - // We don't add the port to prevent from breaking rewrite rules checking the - // host that do not take into account the port number. - 'Host' => "Host: $host", - 'User-Agent' => 'User-Agent: Drupal (+http://drupal.org/)', - 'Content-Length' => 'Content-Length: '. strlen($data) - ); - - // If the server url has a user then attempt to use basic authentication - if (isset($uri['user'])) { - $defaults['Authorization'] = 'Authorization: Basic '. base64_encode($uri['user'] . (!empty($uri['pass']) ? ":". $uri['pass'] : '')); - } - - // If the database prefix is being used by SimpleTest to run the tests in a copied - // database then set the user-agent header to the database prefix so that any - // calls to other Drupal pages will run the SimpleTest prefixed database. The - // user-agent is used to ensure that multiple testing sessions running at the - // same time won't interfere with each other as they would if the database - // prefix were stored statically in a file or database variable. - if (is_string($db_prefix) && preg_match("/^simpletest\d+$/", $db_prefix, $matches)) { - $defaults['User-Agent'] = 'User-Agent: ' . $matches[0]; - } - - foreach ($headers as $header => $value) { - $defaults[$header] = $header .': '. $value; - } - - $request = $method .' '. $path ." HTTP/1.0\r\n"; - $request .= implode("\r\n", $defaults); - $request .= "\r\n\r\n"; - $request .= $data; - - $result->request = $request; - - fwrite($fp, $request); - - // Fetch response. - $response = ''; - while (!feof($fp) && $chunk = fread($fp, 1024)) { - $response .= $chunk; - } - fclose($fp); - - // Parse response. - list($split, $result->data) = explode("\r\n\r\n", $response, 2); - $split = preg_split("/\r\n|\n|\r/", $split); - - list($protocol, $code, $text) = explode(' ', trim(array_shift($split)), 3); - $result->headers = array(); - - // Parse headers. - while ($line = trim(array_shift($split))) { - list($header, $value) = explode(':', $line, 2); - if (isset($result->headers[$header]) && $header == 'Set-Cookie') { - // RFC 2109: the Set-Cookie response header comprises the token Set- - // Cookie:, followed by a comma-separated list of one or more cookies. - $result->headers[$header] .= ','. trim($value); + return $result; } - else { - $result->headers[$header] = trim($value); + + // Construct the path to act on. + $path = $uri['path'] ?? '/'; + if (array_key_exists('query', $uri)) { + $path .= '?' . $uri['query']; } - } - $responses = array( - 100 => 'Continue', 101 => 'Switching Protocols', - 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', - 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', - 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', - 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported' - ); - // RFC 2616 states that all unknown HTTP codes must be treated the same as the - // base code in their class. - if (!isset($responses[$code])) { - $code = floor($code / 100) * 100; - } + // Create HTTP request. + $defaults = [ + // RFC 2616: "non-standard ports MUST, default ports MAY be included". + // We don't add the port to prevent from breaking rewrite rules checking the + // host that do not take into account the port number. + 'Host' => "Host: {$host}", + 'User-Agent' => 'User-Agent: Drupal (+http://drupal.org/)', + 'Content-Length' => 'Content-Length: ' . strlen($data), + ]; - switch ($code) { + // If the server url has a user then attempt to use basic authentication + if (array_key_exists('user', $uri)) { + $defaults['Authorization'] = 'Authorization: Basic ' + . base64_encode($uri['user'] + . (!empty($uri['pass']) ? ':' . $uri['pass'] : '')); + } + + // If the database prefix is being used by SimpleTest to run the tests in a copied + // database then set the user-agent header to the database prefix so that any + // calls to other Drupal pages will run the SimpleTest prefixed database. The + // user-agent is used to ensure that multiple testing sessions running at the + // same time won't interfere with each other as they would if the database + // prefix were stored statically in a file or database variable. + if ( + is_string($db_prefix) + && preg_match('/^simpletest\d+$/', $db_prefix, $matches) + ) { + $defaults['User-Agent'] = 'User-Agent: ' . $matches[0]; + } + + foreach ($headers as $header => $value) { + $defaults[$header] = $header . ': ' . $value; + } + + $request = $method . ' ' . $path . " HTTP/1.0\r\n"; + $request .= implode("\r\n", $defaults); + $request .= "\r\n\r\n"; + $request .= $data; + + $result->request = $request; + + fwrite($fp, $request); + + // Fetch response. + $response = ''; + while (!feof($fp) && ($chunk = fread($fp, 1024)) !== false) { + $response .= $chunk; + } + fclose($fp); + + // Parse response. + [$split, $result->data] = explode("\r\n\r\n", $response, 2); + $split = preg_split("/\r\n|\n|\r/", $split); + + [$protocol, $code, $text] = explode(' ', trim(array_shift($split)), 3); + $result->headers = []; + + // Parse headers. + while (($line = trim(array_shift($split))) !== '') { + [$header, $value] = explode(':', $line, 2); + if ( + array_key_exists($header, $result->headers) + && $header === 'Set-Cookie' + ) { + // RFC 2109: the Set-Cookie response header comprises the token Set- + // Cookie:, followed by a comma-separated list of one or more cookies. + $result->headers[$header] .= ',' . trim($value); + } else { + $result->headers[$header] = trim($value); + } + } + + $responses = [ + 100 => 'Continue', 101 => 'Switching Protocols', + 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', + 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', + 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', + 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported', + ]; + // RFC 2616 states that all unknown HTTP codes must be treated the same as the + // base code in their class. + if (!array_key_exists($code, $responses)) { + $code = floor($code / 100) * 100; + } + + switch ($code) { case 200: // OK case 304: // Not modified break; @@ -518,18 +540,17 @@ class MollomPlugin extends Plugin $location = $result->headers['Location']; if ($retry) { - $result = drupal_http_request($result->headers['Location'], $headers, $method, $data, --$retry); - $result->redirect_code = $result->code; + $result = drupal_http_request($result->headers['Location'], $headers, $method, $data, --$retry); + $result->redirect_code = $result->code; } $result->redirect_url = $location; - break; default: $result->error = $text; } - $result->code = $code; - return $result; + $result->code = $code; + return $result; } /** @@ -540,13 +561,17 @@ class MollomPlugin extends Plugin * @return * Object */ - function xmlrpc_message($message) { - $xmlrpc_message = new stdClass(); - $xmlrpc_message->array_structs = array(); // The stack used to keep track of the current array/struct - $xmlrpc_message->array_structs_types = array(); // The stack used to keep track of if things are structs or array - $xmlrpc_message->current_struct_name = array(); // A stack as well - $xmlrpc_message->message = $message; - return $xmlrpc_message; + public function xmlrpc_message($message) + { + $xmlrpc_message = new stdClass(); + // The stack used to keep track of the current array/struct + $xmlrpc_message->array_structs = []; + // The stack used to keep track of if things are structs or array + $xmlrpc_message->array_structs_types = []; + // A stack as well + $xmlrpc_message->current_struct_name = []; + $xmlrpc_message->message = $message; + return $xmlrpc_message; } /** @@ -558,30 +583,46 @@ class MollomPlugin extends Plugin * @return * TRUE if parsing succeeded; FALSE otherwise */ - function xmlrpc_message_parse(&$xmlrpc_message) { - // First remove the XML declaration - $xmlrpc_message->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $xmlrpc_message->message); - if (trim($xmlrpc_message->message) == '') { - return FALSE; - } - $xmlrpc_message->_parser = xml_parser_create(); - // Set XML parser to take the case of tags into account. - xml_parser_set_option($xmlrpc_message->_parser, XML_OPTION_CASE_FOLDING, FALSE); - // Set XML parser callback functions - xml_set_element_handler($xmlrpc_message->_parser, array('MollomPlugin', 'xmlrpc_message_tag_open'), array('MollomPlugin', 'xmlrpc_message_tag_close')); - xml_set_character_data_handler($xmlrpc_message->_parser, array('MollomPlugin', 'xmlrpc_message_cdata')); - $this->xmlrpc_message_set($xmlrpc_message); - if (!xml_parse($xmlrpc_message->_parser, $xmlrpc_message->message)) { - return FALSE; - } - xml_parser_free($xmlrpc_message->_parser); - // Grab the error messages, if any - $xmlrpc_message = $this->xmlrpc_message_get(); - if ($xmlrpc_message->messagetype == 'fault') { - $xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode']; - $xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString']; - } - return TRUE; + public function xmlrpc_message_parse(&$xmlrpc_message) + { + // First remove the XML declaration + $xmlrpc_message->message = preg_replace( + '/<\?xml(.*)?\?'.'>/', + '', + $xmlrpc_message->message + ); + if (trim($xmlrpc_message->message) === '') { + return false; + } + $xmlrpc_message->_parser = xml_parser_create(); + // Set XML parser to take the case of tags into account. + xml_parser_set_option( + $xmlrpc_message->_parser, + XML_OPTION_CASE_FOLDING, + false + ); + // Set XML parser callback functions + xml_set_element_handler( + $xmlrpc_message->_parser, + ['MollomPlugin', 'xmlrpc_message_tag_open'], + ['MollomPlugin', 'xmlrpc_message_tag_close'] + ); + xml_set_character_data_handler( + $xmlrpc_message->_parser, + ['MollomPlugin', 'xmlrpc_message_cdata'] + ); + $this->xmlrpc_message_set($xmlrpc_message); + if (!xml_parse($xmlrpc_message->_parser, $xmlrpc_message->message)) { + return false; + } + xml_parser_free($xmlrpc_message->_parser); + // Grab the error messages, if any + $xmlrpc_message = $this->xmlrpc_message_get(); + if ($xmlrpc_message->messagetype === 'fault') { + $xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode']; + $xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString']; + } + return true; } /** @@ -592,23 +633,26 @@ class MollomPlugin extends Plugin * @return * The most recently stored $xmlrpc_message */ - function xmlrpc_message_set($value = NULL) { - static $xmlrpc_message; - if ($value) { - $xmlrpc_message = $value; - } - return $xmlrpc_message; + public function xmlrpc_message_set($value = null) + { + static $xmlrpc_message; + if ($value) { + $xmlrpc_message = $value; + } + return $xmlrpc_message; } - function xmlrpc_message_get() { - return $this->xmlrpc_message_set(); + public function xmlrpc_message_get() + { + return $this->xmlrpc_message_set(); } - function xmlrpc_message_tag_open($parser, $tag, $attr) { - $xmlrpc_message = $this->xmlrpc_message_get(); - $xmlrpc_message->current_tag_contents = ''; - $xmlrpc_message->last_open = $tag; - switch ($tag) { + public function xmlrpc_message_tag_open($parser, $tag, $attr) + { + $xmlrpc_message = $this->xmlrpc_message_get(); + $xmlrpc_message->current_tag_contents = ''; + $xmlrpc_message->last_open = $tag; + switch ($tag) { case 'methodCall': case 'methodResponse': case 'fault': @@ -624,60 +668,62 @@ class MollomPlugin extends Plugin $xmlrpc_message->array_structs[] = array(); break; } - $this->xmlrpc_message_set($xmlrpc_message); + $this->xmlrpc_message_set($xmlrpc_message); } - function xmlrpc_message_cdata($parser, $cdata) { - $xmlrpc_message = $this->xmlrpc_message_get(); - $xmlrpc_message->current_tag_contents .= $cdata; - $this->xmlrpc_message_set($xmlrpc_message); + public function xmlrpc_message_cdata($parser, $cdata) + { + $xmlrpc_message = $this->xmlrpc_message_get(); + $xmlrpc_message->current_tag_contents .= $cdata; + $this->xmlrpc_message_set($xmlrpc_message); } - function xmlrpc_message_tag_close($parser, $tag) { - $xmlrpc_message = $this->xmlrpc_message_get(); - $value_flag = FALSE; - switch ($tag) { + public function xmlrpc_message_tag_close($parser, $tag) + { + $xmlrpc_message = $this->xmlrpc_message_get(); + $value_flag = false; + switch ($tag) { case 'int': case 'i4': $value = (int)trim($xmlrpc_message->current_tag_contents); - $value_flag = TRUE; + $value_flag = true; break; case 'double': $value = (double)trim($xmlrpc_message->current_tag_contents); - $value_flag = TRUE; + $value_flag = true; break; case 'string': $value = $xmlrpc_message->current_tag_contents; - $value_flag = TRUE; + $value_flag = true; break; case 'dateTime.iso8601': $value = xmlrpc_date(trim($xmlrpc_message->current_tag_contents)); // $value = $iso->getTimestamp(); - $value_flag = TRUE; + $value_flag = true; break; case 'value': // If no type is indicated, the type is string // We take special care for empty values if (trim($xmlrpc_message->current_tag_contents) != '' || (isset($xmlrpc_message->last_open) && ($xmlrpc_message->last_open == 'value'))) { - $value = (string)$xmlrpc_message->current_tag_contents; - $value_flag = TRUE; + $value = (string)$xmlrpc_message->current_tag_contents; + $value_flag = true; } unset($xmlrpc_message->last_open); break; case 'boolean': $value = (boolean)trim($xmlrpc_message->current_tag_contents); - $value_flag = TRUE; + $value_flag = true; break; case 'base64': $value = base64_decode(trim($xmlrpc_message->current_tag_contents)); - $value_flag = TRUE; + $value_flag = true; break; // Deal with stacks of arrays and structs case 'data': case 'struct': - $value = array_pop($xmlrpc_message->array_structs ); + $value = array_pop($xmlrpc_message->array_structs); array_pop($xmlrpc_message->array_structs_types); - $value_flag = TRUE; + $value_flag = true; break; case 'member': array_pop($xmlrpc_message->current_struct_name); @@ -690,27 +736,25 @@ class MollomPlugin extends Plugin break; } - if ($value_flag) { - if (count($xmlrpc_message->array_structs ) > 0) { - // Add value to struct or array - if ($xmlrpc_message->array_structs_types[count($xmlrpc_message->array_structs_types)-1] == 'struct') { - // Add to struct - $xmlrpc_message->array_structs [count($xmlrpc_message->array_structs )-1][$xmlrpc_message->current_struct_name[count($xmlrpc_message->current_struct_name)-1]] = $value; - } - else { - // Add to array - $xmlrpc_message->array_structs [count($xmlrpc_message->array_structs )-1][] = $value; - } + if ($value_flag) { + if (count($xmlrpc_message->array_structs) > 0) { + // Add value to struct or array + if ($xmlrpc_message->array_structs_types[count($xmlrpc_message->array_structs_types) - 1] === 'struct') { + // Add to struct + $xmlrpc_message->array_structs[count($xmlrpc_message->array_structs) - 1][$xmlrpc_message->current_struct_name[count($xmlrpc_message->current_struct_name) - 1]] = $value; + } else { + // Add to array + $xmlrpc_message->array_structs[count($xmlrpc_message->array_structs) - 1][] = $value; + } + } else { + // Just add as a parameter + $xmlrpc_message->params[] = $value; + } } - else { - // Just add as a parameter - $xmlrpc_message->params[] = $value; + if (!in_array($tag, ['data', 'struct', 'member'])) { + $xmlrpc_message->current_tag_contents = ''; } - } - if (!in_array($tag, array("data", "struct", "member"))) { - $xmlrpc_message->current_tag_contents = ''; - } - $this->xmlrpc_message_set($xmlrpc_message); + $this->xmlrpc_message_set($xmlrpc_message); } /** @@ -723,11 +767,12 @@ class MollomPlugin extends Plugin * @return * Object */ - function xmlrpc_request($method, $args) { - $xmlrpc_request = new stdClass(); - $xmlrpc_request->method = $method; - $xmlrpc_request->args = $args; - $xmlrpc_request->xml = <<method = $method; + $xmlrpc_request->args = $args; + $xmlrpc_request->xml = << {$xmlrpc_request->method} @@ -735,33 +780,34 @@ class MollomPlugin extends Plugin EOD; - foreach ($xmlrpc_request->args as $arg) { - $xmlrpc_request->xml .= ''; - $v = $this->xmlrpc_value($arg); - $xmlrpc_request->xml .= $this->xmlrpc_value_get_xml($v); - $xmlrpc_request->xml .= "\n"; - } - $xmlrpc_request->xml .= ''; - return $xmlrpc_request; + foreach ($xmlrpc_request->args as $arg) { + $xmlrpc_request->xml .= ''; + $v = $this->xmlrpc_value($arg); + $xmlrpc_request->xml .= $this->xmlrpc_value_get_xml($v); + $xmlrpc_request->xml .= "\n"; + } + $xmlrpc_request->xml .= ''; + return $xmlrpc_request; } - function xmlrpc_error($code = NULL, $message = NULL, $reset = FALSE) { - static $xmlrpc_error; - if (isset($code)) { - $xmlrpc_error = new stdClass(); - $xmlrpc_error->is_error = TRUE; - $xmlrpc_error->code = $code; - $xmlrpc_error->message = $message; - } - elseif ($reset) { - $xmlrpc_error = NULL; - } - return $xmlrpc_error; + public function xmlrpc_error($code = null, $message = null, $reset = false) + { + static $xmlrpc_error; + if (!is_null($code)) { + $xmlrpc_error = new stdClass(); + $xmlrpc_error->is_error = true; + $xmlrpc_error->code = $code; + $xmlrpc_error->message = $message; + } elseif ($reset) { + $xmlrpc_error = null; + } + return $xmlrpc_error; } - function xmlrpc_error_get_xml($xmlrpc_error) { - return << @@ -782,45 +828,55 @@ EOD; EOD; } - function xmlrpc_date($time) { - $xmlrpc_date = new stdClass(); - $xmlrpc_date->is_date = TRUE; - // $time can be a PHP timestamp or an ISO one - if (is_numeric($time)) { - $xmlrpc_date->year = gmdate('Y', $time); - $xmlrpc_date->month = gmdate('m', $time); - $xmlrpc_date->day = gmdate('d', $time); - $xmlrpc_date->hour = gmdate('H', $time); - $xmlrpc_date->minute = gmdate('i', $time); - $xmlrpc_date->second = gmdate('s', $time); - $xmlrpc_date->iso8601 = gmdate('Ymd\TH:i:s', $time); - } - else { - $xmlrpc_date->iso8601 = $time; - $time = str_replace(array('-', ':'), '', $time); - $xmlrpc_date->year = substr($time, 0, 4); - $xmlrpc_date->month = substr($time, 4, 2); - $xmlrpc_date->day = substr($time, 6, 2); - $xmlrpc_date->hour = substr($time, 9, 2); - $xmlrpc_date->minute = substr($time, 11, 2); - $xmlrpc_date->second = substr($time, 13, 2); - } - return $xmlrpc_date; + public function xmlrpc_date($time) + { + $xmlrpc_date = new stdClass(); + $xmlrpc_date->is_date = true; + // $time can be a PHP timestamp or an ISO one + if (is_numeric($time)) { + $xmlrpc_date->year = gmdate('Y', $time); + $xmlrpc_date->month = gmdate('m', $time); + $xmlrpc_date->day = gmdate('d', $time); + $xmlrpc_date->hour = gmdate('H', $time); + $xmlrpc_date->minute = gmdate('i', $time); + $xmlrpc_date->second = gmdate('s', $time); + $xmlrpc_date->iso8601 = gmdate('Ymd\TH:i:s', $time); + } else { + $xmlrpc_date->iso8601 = $time; + $time = str_replace(array('-', ':'), '', $time); + $xmlrpc_date->year = substr($time, 0, 4); + $xmlrpc_date->month = substr($time, 4, 2); + $xmlrpc_date->day = substr($time, 6, 2); + $xmlrpc_date->hour = substr($time, 9, 2); + $xmlrpc_date->minute = substr($time, 11, 2); + $xmlrpc_date->second = substr($time, 13, 2); + } + return $xmlrpc_date; } - function xmlrpc_date_get_xml($xmlrpc_date) { - return ''. $xmlrpc_date->year . $xmlrpc_date->month . $xmlrpc_date->day .'T'. $xmlrpc_date->hour .':'. $xmlrpc_date->minute .':'. $xmlrpc_date->second .''; + public function xmlrpc_date_get_xml($xmlrpc_date) + { + return '' + . $xmlrpc_date->year + . $xmlrpc_date->month + . $xmlrpc_date->day + . 'T' . $xmlrpc_date->hour + . ':'. $xmlrpc_date->minute + . ':'. $xmlrpc_date->second + . ''; } - function xmlrpc_base64($data) { - $xmlrpc_base64 = new stdClass(); - $xmlrpc_base64->is_base64 = TRUE; - $xmlrpc_base64->data = $data; - return $xmlrpc_base64; + public function xmlrpc_base64($data) + { + $xmlrpc_base64 = new stdClass(); + $xmlrpc_base64->is_base64 = true; + $xmlrpc_base64->data = $data; + return $xmlrpc_base64; } - function xmlrpc_base64_get_xml($xmlrpc_base64) { - return ''. base64_encode($xmlrpc_base64->data) .''; + public function xmlrpc_base64_get_xml($xmlrpc_base64) + { + return ''. base64_encode($xmlrpc_base64->data) .''; } /** @@ -830,63 +886,69 @@ EOD; * @return * A $xmlrpc_message object if the call succeeded; FALSE if the call failed */ - function _xmlrpc() { - $args = func_get_args(); - $url = array_shift($args); - $this->xmlrpc_clear_error(); - if (is_array($args[0])) { - $method = 'system.multicall'; - $multicall_args = array(); - foreach ($args[0] as $call) { - $multicall_args[] = array('methodName' => array_shift($call), 'params' => $call); + public function _xmlrpc() + { + $args = func_get_args(); + $url = array_shift($args); + $this->xmlrpc_clear_error(); + if (is_array($args[0])) { + $method = 'system.multicall'; + $multicall_args = []; + foreach ($args[0] as $call) { + $multicall_args[] = [ + 'methodName' => array_shift($call), + 'params' => $call, + ]; + } + $args = [$multicall_args]; + } else { + $method = array_shift($args); } - $args = array($multicall_args); - } - else { - $method = array_shift($args); - } - $xmlrpc_request = $this->xmlrpc_request($method, $args); - $result = $this->http_request($url, array("Content-Type" => "text/xml"), 'POST', $xmlrpc_request->xml); - if ($result->code != 200) { - $this->xmlrpc_error($result->code, $result->error); - return FALSE; - } - $message = $this->xmlrpc_message($result->data); - // Now parse what we've got back - if (!$this->xmlrpc_message_parse($message)) { - // XML error - $this->xmlrpc_error(-32700, t('Parse error. Not well formed')); - return FALSE; - } - // Is the message a fault? - if ($message->messagetype == 'fault') { - $this->xmlrpc_error($message->fault_code, $message->fault_string); - return FALSE; - } - // Message must be OK - return $message->params[0]; + $xmlrpc_request = $this->xmlrpc_request($method, $args); + $result = $this->http_request($url, [ + 'Content-Type' => 'text/xml', + ], 'POST', $xmlrpc_request->xml); + if ($result->code !== 200) { + $this->xmlrpc_error($result->code, $result->error); + return false; + } + $message = $this->xmlrpc_message($result->data); + // Now parse what we've got back + if (!$this->xmlrpc_message_parse($message)) { + // XML error + $this->xmlrpc_error(-32700, t('Parse error. Not well formed')); + return false; + } + // Is the message a fault? + if ($message->messagetype === 'fault') { + $this->xmlrpc_error($message->fault_code, $message->fault_string); + return false; + } + // Message must be OK + return $message->params[0]; } /** * Returns the last XML-RPC client error number */ - function xmlrpc_errno() { - $error = $this->xmlrpc_error(); - return ($error != NULL ? $error->code : NULL); + public function xmlrpc_errno() + { + return $this->xmlrpc_error()->code ?? null; } /** * Returns the last XML-RPC client error message */ - function xmlrpc_error_msg() { - $error = xmlrpc_error(); - return ($error != NULL ? $error->message : NULL); + public function xmlrpc_error_msg() + { + return xmlrpc_error()->message ?? null; } /** * Clears any previous error. */ - function xmlrpc_clear_error() { - $this->xmlrpc_error(NULL, NULL, TRUE); + public function xmlrpc_clear_error() + { + $this->xmlrpc_error(null, null, true); } } diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 833fe456d8..a9d9e793d9 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -964,7 +964,10 @@ class Ostatus_profile extends Managed_DataObject $best = false; // Take the exact-size avatar, or the largest avatar, or the first avatar if all sizeless foreach ($object->avatarLinks as $avatar) { - if ($avatar->width == AVATAR_PROFILE_SIZE && $avatar->height = AVATAR_PROFILE_SIZE) { + if ( + $avatar->width === AVATAR_PROFILE_SIZE + && $avatar->height === AVATAR_PROFILE_SIZE + ) { // Exact match! $best = $avatar; break; diff --git a/plugins/Sitemap/actions/sitemap.php b/plugins/Sitemap/actions/sitemap.php index 16c2014efd..3442bd5457 100644 --- a/plugins/Sitemap/actions/sitemap.php +++ b/plugins/Sitemap/actions/sitemap.php @@ -1,44 +1,38 @@ . + /** - * StatusNet, the distributed open-source microblogging tool - * * Superclass for sitemap-generating actions * - * PHP version 5 - * - * LICENCE: 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 Sitemap - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('STATUSNET')) { - exit(1); -} +defined('GNUSOCIAL') || die(); /** * superclass for sitemap actions * - * @category Sitemap - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @category Sitemap + * @package GNUsocial + * @author Evan Prodromou + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class SitemapAction extends Action { @@ -49,7 +43,7 @@ class SitemapAction extends Action * * @return void */ - function handle() + public function handle() { parent::handle(); @@ -58,8 +52,8 @@ class SitemapAction extends Action $this->elementStart('urlset', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9')); - while (list($url, $lm, $cf, $p) = $this->nextUrl()) { - $this->showUrl($url, $lm, $cf, $p); + while (!is_null($next = $this->nextUrl())) { + $this->showUrl(...$next); } $this->elementEnd('urlset'); @@ -67,7 +61,7 @@ class SitemapAction extends Action $this->endXML(); } - function lastModified() + public function lastModified() { $y = $this->trimmed('year'); @@ -88,8 +82,12 @@ class SitemapAction extends Action } } - function showUrl($url, $lastMod=null, $changeFreq=null, $priority=null) - { + public function showUrl( + $url, + $lastMod = null, + $changeFreq = null, + $priority = null + ) { $this->elementStart('url'); $this->element('loc', null, $url); if (!is_null($lastMod)) { @@ -104,12 +102,12 @@ class SitemapAction extends Action $this->elementEnd('url'); } - function nextUrl() + public function nextUrl() { return null; } - function isReadOnly() + public function isReadOnly() { return true; } diff --git a/plugins/WebFinger/actions/ownerxrd.php b/plugins/WebFinger/actions/ownerxrd.php index 6f04c1c7d8..be881af7c6 100644 --- a/plugins/WebFinger/actions/ownerxrd.php +++ b/plugins/WebFinger/actions/ownerxrd.php @@ -1,29 +1,28 @@ . - */ +// This file is part of GNU social - https://www.gnu.org/software/social +// +// GNU social 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. +// +// GNU social 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 GNU social. If not, see . /** - * @package WebFingerPlugin - * @author James Walker - * @author Mikael Nordfeldth + * @package WebFingerPlugin + * @author James Walker + * @author Mikael Nordfeldth + * @copyright 2010 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('GNUSOCIAL')) { exit(1); } +defined('GNUSOCIAL') || die(); class OwnerxrdAction extends WebfingerAction { @@ -36,7 +35,7 @@ class OwnerxrdAction extends WebfingerAction $nick = common_canonical_nickname($user->nickname); $args['resource'] = 'acct:' . $nick . '@' . common_config('site', 'server'); - // We have now set $args['resource'] to the configured value, since + // We have now set $args['resource'] to the configured value, since // only this local site configuration knows who the owner is! parent::prepare($args); @@ -49,7 +48,7 @@ class OwnerxrdAction extends WebfingerAction // Check to see if a $config['webfinger']['owner'] has been set // and then make sure 'subject' is set to that primary identity. - if ($owner = common_config('webfinger', 'owner')) { + if (!empty($owner = common_config('webfinger', 'owner'))) { $this->xrd->aliases[] = $this->xrd->subject; $this->xrd->subject = Discovery::normalize($owner); } else { diff --git a/scripts/console.php b/scripts/console.php index 8e7f925a5f..741368f806 100644 --- a/scripts/console.php +++ b/scripts/console.php @@ -67,7 +67,10 @@ call_user_func(function () { // Find composer.json if (is_file($path . '/composer.json')) { - if ($cfg = json_decode(file_get_contents($path . '/composer.json'), true)) { + if (!empty($cfg = json_decode( + file_get_contents($path . '/composer.json'), + true + ))) { if (isset($cfg['name']) && $cfg['name'] === 'psy/psysh') { // We're inside the psysh project. Let's use the local // Composer autoload. @@ -82,7 +85,10 @@ call_user_func(function () { // Or a composer.lock if (is_file($path . '/composer.lock')) { - if ($cfg = json_decode(file_get_contents($path . '/composer.lock'), true)) { + if (!empty($cfg = json_decode( + file_get_contents($path . '/composer.lock'), + true + ))) { foreach (array_merge($cfg['packages'], $cfg['packages-dev']) as $pkg) { if (isset($pkg['name']) && $pkg['name'] === 'psy/psysh') { // We're inside a project which requires psysh. We'll diff --git a/scripts/fixup_deletions.php b/scripts/fixup_deletions.php index 330ccc3765..09f6219249 100755 --- a/scripts/fixup_deletions.php +++ b/scripts/fixup_deletions.php @@ -1,21 +1,23 @@ #!/usr/bin/env php . + /* - * StatusNet - a distributed open-source microblogging tool - * Copyright (C) 2010 StatusNet, Inc. - * - * 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 . + * @copyright 2010 StatusNet, Inc. + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ define('INSTALLDIR', dirname(__DIR__)); @@ -71,16 +73,19 @@ function get_max_profile_id() */ function get_missing_profiles($start, $end) { - $query = sprintf("SELECT id FROM profile WHERE id BETWEEN %d AND %d", - $start, $end); + $query = sprintf( + 'SELECT id FROM profile WHERE id BETWEEN %d AND %d', + $start, + $end + ); $profile = new Profile(); $profile->query($query); $all = range($start, $end); - $known = array(); - while ($row = $profile->fetch()) { - $known[] = intval($profile->id); + $known = []; + while ($profile->fetch()) { + $known[] = (int) $profile->id; } unset($profile); @@ -164,4 +169,3 @@ for ($start = $begin; $start <= $final; $start += $chunk) { } echo "done.\n"; -