[VersionBump] Patch e2e3c1cdcd

With PHP 7 comes the [random_bytes()](https://php.net/manual/en/function.random-bytes.php) and the [random_int()](https://www.php.net/manual/en/function.random-int.php) function which generates cryptographically secure pseudo-random bytes and integers, respectively.

DOCUMENTATION/DEVELOPERS/EVENTS.txt

@@ -1496,6 +1496,3 @@ StartDocNav: Before outputting the docs Nav
 
 EndDocNav: After outputting the docs Nav
 - $nav: The DoclNav widget
-
-NodeInfoProtocols: List of protocols to be reported on NodeInfo requests
-- &$protocols - Add protocol to the list so it is informed upon request

DOCUMENTATION/SYSTEM_ADMINISTRATORS/webserver_conf/nginx.conf.sample

@@ -32,7 +32,8 @@ server {
     index index.php;
 
 # PHP
-    location ^~ /index.php {
+    location ~ ^/(index|install)\.php$ {
+    #location ^~ /index.php {
         include fastcgi_params;
         include snippets/fastcgi-php.conf;
 

actions/confirmaddress.php

@@ -140,6 +140,7 @@ class ConfirmaddressAction extends ManagedAction
                 $user_im_prefs->screenname = $confirm->address;
                 $user_im_prefs->transport = $confirm->address_type;
                 $user_im_prefs->user_id = $cur->id;
+                $user_im_prefs->created = common_sql_now();
                 $result = $user_im_prefs->insert();
 
                 if ($result === false) {

actions/showprofiletag.php

@@ -32,7 +32,7 @@ class ShowprofiletagAction extends ShowstreamAction
     {
         $tag = common_canonical_tag($this->arg('tag'));
         try {
-            $this->peopletag = Profile_list::getByPK(array('tagger' => $this->target->getID(), 'tag' => $tag));
+            $this->peopletag = Profile_list::getByPK(['tagger' => $this->target->getID(), 'tag' => $tag]);
         } catch (NoResultException $e) {
             // TRANS: Client error displayed trying to reference a non-existing list.
             throw new ClientException('No such list.');

classes/Profile_list.php

@@ -48,8 +48,8 @@ class Profile_list extends Managed_DataObject
                 'description' => array('type' => 'text', 'description' => 'description of the people tag'),
                 'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'),
 
-                'created' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
-                'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the tag was added'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was modified'),
 
                 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'),
                 'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page to link to'),

classes/User_im_prefs.php

@@ -57,8 +57,8 @@ class User_im_prefs extends Managed_DataObject
                 'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
                 'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
                 'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id', 'transport'),
             'unique keys' => array(

extlib/DB/DataObject.php

@@ -558,8 +558,7 @@ class DB_DataObject extends DB_DataObject_Overload
         if ((new PEAR)->isError($message)) {
             $error = $message;
         } else {
-            //require_once 'DB/DataObject/Error.php';
-            require_once 'Error.php';
+            require_once 'DB/DataObject/Error.php';
             $dor = new PEAR();
             $error = $dor->raiseError(
                 $message,

lib/framework.php

@@ -32,7 +32,7 @@ defined('GNUSOCIAL') || die();
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.20.5');
+define('GNUSOCIAL_BASE_VERSION', '1.20.10');
 define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);

lib/inboxnoticestream.php

@@ -107,19 +107,26 @@ class RawInboxNoticeStream extends FullNoticeStream
         $notice->whereAdd(sprintf('notice.created > "%s"', $notice->escape($this->target->created)));
         // Reply:: is a table of mentions
         // Subscription:: is a table of subscriptions (every user is subscribed to themselves)
-        // Sort in descending order as id will give us even really old posts,
-        // which were recently imported. For example, if a remote instance had
-        // problems and just managed to post here.
-        $notice->whereAdd(
-            sprintf('id IN (SELECT DISTINCT id FROM (' .
-                '(SELECT id FROM notice WHERE profile_id IN (SELECT subscribed FROM subscription WHERE subscriber = %1$d)) UNION ' .
-                '(SELECT notice_id AS id FROM reply WHERE profile_id = %1$d) UNION ' .
-                '(SELECT notice_id AS id FROM attention WHERE profile_id = %1$d) UNION ' .
-                '(SELECT notice_id AS id FROM group_inbox WHERE group_id IN (SELECT group_id FROM group_member WHERE profile_id = %1$d)) ' .
-                'ORDER BY id DESC) AS T)',
-                $this->target->getID())
+        $notice->_join .= sprintf(
+            "\n" . <<<'END'
+            LEFT JOIN (
+              SELECT id FROM notice
+                WHERE profile_id
+                IN (SELECT subscribed FROM subscription WHERE subscriber = %1$d)
+              UNION ALL
+              SELECT notice_id AS id FROM reply WHERE profile_id = %1$d
+              UNION ALL
+              SELECT notice_id AS id FROM attention WHERE profile_id = %1$d
+              UNION ALL
+              SELECT notice_id AS id FROM group_inbox INNER JOIN group_member USING (group_id)
+                WHERE group_member.profile_id = %1$d
+            ) AS t1 USING (id)
+            END,
+            $this->target->getID()
         );
 
+        $notice->whereAdd('t1.id IS NOT NULL');
+
         if (!empty($since_id)) {
             $notice->whereAdd(sprintf('notice.id > %d', $since_id));
         }
@@ -129,6 +136,11 @@ class RawInboxNoticeStream extends FullNoticeStream
 
         self::filterVerbs($notice, $this->selectVerbs);
 
+        // notice.id will give us even really old posts, which were recently
+        // imported. For example if a remote instance had problems and just
+        // managed to post here.
+        $notice->orderBy('id DESC');
+
         $notice->limit($offset, $limit);
 
         if (!$notice->find()) {

lib/router.php

@@ -924,7 +924,7 @@ class Router
 
                 $m->connect('all/:tag',
                                 array('action' => 'showprofiletag',
-                                      'nickname' => $nickname,
+                                      'tagger' => $nickname,
                                       'tag' => self::REGEX_TAG));
 
                 foreach (array('subscriptions', 'subscribers') as $a) {

lib/util.php

@@ -1744,13 +1744,7 @@ function common_random_rawstr($bytes)
  */
 function common_random_hexstr($bytes)
 {
-    $str = common_random_rawstr($bytes);
-
-    $hexstr = '';
-    for ($i = 0; $i < $bytes; $i++) {
-        $hexstr .= sprintf("%02x", ord($str[$i]));
-    }
-    return $hexstr;
+    return bin2hex(random_bytes($bytes));
 }
 
 function common_urandom($bytes)
@@ -2224,20 +2218,21 @@ function common_user_uri(&$user)
                             false);
 }
 
-// 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
-
-function common_confirmation_code($bits)
-{
-    // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
-    static $codechars = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
+/**
+ * Generates cryptographically secure pseudo-random strings out of a allowed chars string
+ *
+ * @param $bits int strength of the confirmation code
+ * @param $codechars allowed characters to be used in the confirmation code, by default we use 36 upper case
+ * alphanums and remove lookalikes (0, O, 1, I) = 32 chars = 5 bits to make it easy for the user to type in
+ * @return string confirmation_code of length $bits/5
+ */
+function common_confirmation_code($bits, $codechars = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ') {
     $chars = ceil($bits/5);
+    $codechars_length = strlen($codechars)-1;
     $code = '';
-    for ($i = 0; $i < $chars; $i++) {
-        // XXX: convert to string and back
-        $num = hexdec(common_random_hexstr(1));
-        // XXX: randomness is too precious to throw away almost
-        // 40% of the bits we get!
-        $code .= $codechars[$num%32];
+    for($i = 0; $i < $chars; ++$i) {
+        $random_char = $codechars[random_int(0, $codechars_length)];
+        $code .= $random_char;
     }
     return $code;
 }

plugins/Nodeinfo/EVENTS.txt

@@ -0,0 +1,2 @@
+NodeInfoProtocols: List of protocols to be reported on NodeInfo requests
+- &$protocols - Add protocol to the list so it is informed upon request

plugins/Nodeinfo/classes/Usage_stats.php

@@ -43,7 +43,7 @@ class Usage_stats extends Managed_DataObject
             'fields' => [
                 'type' => ['type' => 'varchar', 'length' => 191, 'description' => 'Type of countable entity'],
                 'count' => ['type' => 'int', 'size' => 'int', 'default' => 0, 'description' => 'Number of entities of this type'],
-                'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+                'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'],
             ],
             'primary key' => ['type'],
             'unique keys' => [

plugins/OStatus/OStatusPlugin.php

@@ -30,7 +30,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class OStatusPlugin extends Plugin
 {
-    const PLUGIN_VERSION = '2.0.1';
+    const PLUGIN_VERSION = '2.0.2';
 
     /**
      * Hook for RouterInitialized event.
@@ -274,6 +274,7 @@ class OStatusPlugin extends Plugin
                        PREG_OFFSET_CAPTURE);
         if ($result === false) {
             common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').');
+            return [];
         } elseif (count($wmatches)) {
             common_debug(sprintf('Found %d matches for WebFinger IDs: %s', count($wmatches), _ve($wmatches)));
         }
@@ -298,6 +299,7 @@ class OStatusPlugin extends Plugin
                        PREG_OFFSET_CAPTURE);
         if ($result === false) {
             common_log(LOG_ERR, __METHOD__ . ': Error parsing profile URL mentions from text (preg_last_error=='.preg_last_error().').');
+            return [];
         } elseif (count($wmatches)) {
             common_debug(sprintf('Found %d matches for profile URL mentions: %s', count($wmatches), _ve($wmatches)));
         }
@@ -593,7 +595,7 @@ class OStatusPlugin extends Plugin
         try {
             $url = $notice->getUrl();
             // If getUrl() throws exception, $url is never set
-            
+
             $bits = parse_url($url);
             $domain = $bits['host'];
             if (substr($domain, 0, 4) == 'www.') {

plugins/Oembed/OembedPlugin.php

@@ -1,43 +1,10 @@
 <?php
-// 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 <http://www.gnu.org/licenses/>.
 
-/**
- * OembedPlugin implementation for GNU social
- *
- * @package   GNUsocial
- * @author    Stephen Paul Weber
- * @author    hannes
- * @author    Mikael Nordfeldth
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
+if (!defined('GNUSOCIAL')) { exit(1); }
 
-defined('GNUSOCIAL') || die();
-
-/**
- * Base class for the oEmbed plugin that does most of the heavy lifting to get
- * and display representations for remote content.
- *
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
 class OembedPlugin extends Plugin
 {
-    const PLUGIN_VERSION = '3.0.1';
+    const PLUGIN_VERSION = '2.0.0';
 
     // settings which can be set in config.php with addPlugin('Oembed', array('param'=>'value', ...));
     // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings
@@ -45,17 +12,12 @@ class OembedPlugin extends Plugin
                                     '^i\d*\.ytimg\.com$' => 'YouTube',
                                     '^i\d*\.vimeocdn\.com$' => 'Vimeo',
                                     );
-    public $append_whitelist = array();  // fill this array as domain_whitelist to add more trusted sources
+    public $append_whitelist = array(); // fill this array as domain_whitelist to add more trusted sources
     public $check_whitelist  = false;    // security/abuse precaution
-    public $keep_original = false;
 
     protected $imgData = array();
 
-    /**
-     * Initialize the oEmbed plugin and set up the environment it needs for it.
-     * Returns true if it initialized properly, the exception object if it
-     * doesn't.
-     */
+    // these should be declared protected everywhere
     public function initialize()
     {
         parent::initialize();
@@ -63,12 +25,6 @@ class OembedPlugin extends Plugin
         $this->domain_whitelist = array_merge($this->domain_whitelist, $this->append_whitelist);
     }
 
-    /**
-     * The code executed on GNU social checking the database schema, which in
-     * this case is to make sure we have the plugin table we need.
-     *
-     * @return bool true if it ran successfully, the exception object if it doesn't.
-     */
     public function onCheckSchema()
     {
         $schema = Schema::get();
@@ -76,28 +32,11 @@ class OembedPlugin extends Plugin
         return true;
     }
 
-    /**
-     * This code executes when GNU social creates the page routing, and we hook
-     * on this event to add our action handler for oEmbed.
-     *
-     * @param $m URLMapper the router that was initialized.
-     * @return bool true if successful, the exception object if it isn't.
-     */
     public function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/oembed', array('action' => 'oembed'));
     }
 
-    /**
-     * This event executes when GNU social encounters a remote URL we then decide
-     * to interrogate for metadata.  oEmbed gloms onto it to see if we have an
-     * oEmbed endpoint or image to try to represent in the post.
-     *
-     * @param $url string        the remote URL we're looking at
-     * @param $dom DOMDocument   the document we're getting metadata from
-     * @param $metadata stdClass class representing the metadata
-     * @return bool true if successful, the exception object if it isn't.
-     */
     public function onGetRemoteUrlMetadataFromDom($url, DOMDocument $dom, stdClass &$metadata)
     {
         try {
@@ -109,20 +48,20 @@ class OembedPlugin extends Plugin
                 'maxheight' => common_config('thumbnail', 'height'),
             );
             $metadata = oEmbedHelper::getOembedFrom($api, $url, $params);
-
-            // Facebook just gives us javascript in its oembed html,
+            
+            // Facebook just gives us javascript in its oembed html, 
             // so use the content of the title element instead
-            if (strpos($url, 'https://www.facebook.com/') === 0) {
-                $metadata->html = @$dom->getElementsByTagName('title')->item(0)->nodeValue;
+            if(strpos($url,'https://www.facebook.com/') === 0) {
+              $metadata->html = @$dom->getElementsByTagName('title')->item(0)->nodeValue;
             }
-
+        
             // Wordpress sometimes also just gives us javascript, use og:description if it is available
             $xpath = new DomXpath($dom);
             $generatorNode = @$xpath->query('//meta[@name="generator"][1]')->item(0);
             if ($generatorNode instanceof DomElement) {
                 // when wordpress only gives us javascript, the html stripped from tags
                 // is the same as the title, so this helps us to identify this (common) case
-                if (strpos($generatorNode->getAttribute('content'), 'WordPress') === 0
+                if(strpos($generatorNode->getAttribute('content'),'WordPress') === 0
                 && trim(strip_tags($metadata->html)) == trim($metadata->title)) {
                     $propertyNode = @$xpath->query('//meta[@property="og:description"][1]')->item(0);
                     if ($propertyNode instanceof DomElement) {
@@ -131,7 +70,6 @@ class OembedPlugin extends Plugin
                 }
             }
         } catch (Exception $e) {
-            // FIXME - make sure the error was because we couldn't get metadata, not something else! -mb
             common_log(LOG_INFO, 'Could not find an oEmbed endpoint using link headers, trying OpenGraph from HTML.');
             // Just ignore it!
             $metadata = OpenGraphHelper::ogFromHtml($dom);
@@ -141,49 +79,41 @@ class OembedPlugin extends Plugin
             // sometimes sites serve the path, not the full URL, for images
             // let's "be liberal in what you accept from others"!
             // add protocol and host if the thumbnail_url starts with /
-            if (substr($metadata->thumbnail_url, 0, 1) == '/') {
+            if(substr($metadata->thumbnail_url,0,1) == '/') {
                 $thumbnail_url_parsed = parse_url($metadata->url);
                 $metadata->thumbnail_url = $thumbnail_url_parsed['scheme']."://".$thumbnail_url_parsed['host'].$metadata->thumbnail_url;
             }
-
+        
             // some wordpress opengraph implementations sometimes return a white blank image
             // no need for us to save that!
-            if ($metadata->thumbnail_url == 'https://s0.wp.com/i/blank.jpg') {
+            if($metadata->thumbnail_url == 'https://s0.wp.com/i/blank.jpg') {
                 unset($metadata->thumbnail_url);
             }
-
-            // FIXME: this is also true of locally-installed wordpress so we should watch out for that.
         }
-        return true;
+
     }
 
     public function onEndShowHeadElements(Action $action)
     {
         switch ($action->getActionName()) {
         case 'attachment':
-            $action->element('link', array('rel'=>'alternate',
+            $action->element('link',array('rel'=>'alternate',
                 'type'=>'application/json+oembed',
                 'href'=>common_local_url(
                     'oembed',
                     array(),
                     array('format'=>'json', 'url'=>
-                        common_local_url(
-                            'attachment',
-                            array('attachment' => $action->attachment->getID())
-                        ))
-                ),
+                        common_local_url('attachment',
+                            array('attachment' => $action->attachment->getID())))),
                 'title'=>'oEmbed'));
-            $action->element('link', array('rel'=>'alternate',
+            $action->element('link',array('rel'=>'alternate',
                 'type'=>'text/xml+oembed',
                 'href'=>common_local_url(
                     'oembed',
                     array(),
                     array('format'=>'xml','url'=>
-                        common_local_url(
-                            'attachment',
-                            array('attachment' => $action->attachment->getID())
-                        ))
-                ),
+                        common_local_url('attachment',
+                            array('attachment' => $action->attachment->getID())))),
                 'title'=>'oEmbed'));
             break;
         case 'shownotice':
@@ -191,21 +121,19 @@ class OembedPlugin extends Plugin
                 break;
             }
             try {
-                $action->element('link', array('rel'=>'alternate',
+                $action->element('link',array('rel'=>'alternate',
                     'type'=>'application/json+oembed',
                     'href'=>common_local_url(
                         'oembed',
                         array(),
-                        array('format'=>'json','url'=>$action->notice->getUrl())
-                    ),
+                        array('format'=>'json','url'=>$action->notice->getUrl())),
                     'title'=>'oEmbed'));
-                $action->element('link', array('rel'=>'alternate',
+                $action->element('link',array('rel'=>'alternate',
                     'type'=>'text/xml+oembed',
                     'href'=>common_local_url(
                         'oembed',
                         array(),
-                        array('format'=>'xml','url'=>$action->notice->getUrl())
-                    ),
+                        array('format'=>'xml','url'=>$action->notice->getUrl())),
                     'title'=>'oEmbed'));
             } catch (InvalidUrlException $e) {
                 // The notice is probably a share or similar, which don't
@@ -217,8 +145,7 @@ class OembedPlugin extends Plugin
         return true;
     }
 
-    public function onEndShowStylesheets(Action $action)
-    {
+    public function onEndShowStylesheets(Action $action) {
         $action->cssLink($this->path('css/oembed.css'));
         return true;
     }
@@ -243,6 +170,7 @@ class OembedPlugin extends Plugin
         if (isset($file->mimetype)
             && (('text/html' === substr($file->mimetype, 0, 9)
             || 'application/xhtml+xml' === substr($file->mimetype, 0, 21)))) {
+
             try {
                 $oembed_data = File_oembed::_getOembed($file->url);
                 if ($oembed_data === false) {
@@ -271,12 +199,9 @@ class OembedPlugin extends Plugin
             if (empty($oembed->author_url)) {
                 $out->text($oembed->author_name);
             } else {
-                $out->element(
-                    'a',
-                    array('href' => $oembed->author_url,
+                $out->element('a', array('href' => $oembed->author_url,
                                          'class' => 'url'),
-                    $oembed->author_name
-                );
+                                $oembed->author_name);
             }
         }
         if (!empty($oembed->provider)) {
@@ -284,12 +209,9 @@ class OembedPlugin extends Plugin
             if (empty($oembed->provider_url)) {
                 $out->text($oembed->provider);
             } else {
-                $out->element(
-                    'a',
-                    array('href' => $oembed->provider_url,
+                $out->element('a', array('href' => $oembed->provider_url,
                                          'class' => 'url'),
-                    $oembed->provider
-                );
+                                $oembed->provider);
             }
         }
         $out->elementEnd('div');
@@ -327,7 +249,7 @@ class OembedPlugin extends Plugin
 
         $out->elementStart('article', ['class'=>'h-entry oembed']);
         $out->elementStart('header');
-        try {
+        try  {
             $thumb = $file->getThumbnail(128, 128);
             $out->element('img', $thumb->getHtmlAttrs(['class'=>'u-photo oembed']));
             unset($thumb);
@@ -375,7 +297,7 @@ class OembedPlugin extends Plugin
 
         return false;
     }
-
+    
     public function onShowUnsupportedAttachmentRepresentation(HTMLOutputter $out, File $file)
     {
         try {
@@ -396,23 +318,13 @@ class OembedPlugin extends Plugin
                 $out->raw($purifier->purify($oembed->html));
             }
             return false;
+            break;
         }
 
         return true;
     }
 
-    /**
-     * This event executes when GNU social is creating a file thumbnail entry in
-     * the database.  We glom onto this to create proper information for oEmbed
-     * object thumbnails.
-     *
-     * @param $file File the file of the created thumbnail
-     * @param &$imgPath string = the path to the created thumbnail
-     * @return bool true if it succeeds (including non-action
-     * states where it isn't oEmbed data, so it doesn't mess up the event handle
-     * for other things hooked into it), or the exception if it fails.
-     */
-    public function onCreateFileImageThumbnailSource(File $file, &$imgPath)
+    public function onCreateFileImageThumbnailSource(File $file, &$imgPath, $media=null)
     {
         // If we are on a private node, we won't do any remote calls (just as a precaution until
         // we can configure this from config.php for the private nodes)
@@ -429,7 +341,8 @@ class OembedPlugin extends Plugin
         try {
             // If we have proper oEmbed data, there should be an entry in the File_oembed
             // and File_thumbnail tables respectively. If not, we're not going to do anything.
-            $thumbnail = File_thumbnail::byFile($file);
+            $file_oembed = File_oembed::getByFile($file);
+            $thumbnail   = File_thumbnail::byFile($file);
         } catch (NoResultException $e) {
             // Not Oembed data, or at least nothing we either can or want to use.
             common_debug('No oEmbed data found for file id=='.$file->getID());
@@ -451,7 +364,7 @@ class OembedPlugin extends Plugin
     }
 
     /**
-     * @return bool             false on no check made, provider name on success
+     * @return boolean          false on no check made, provider name on success
      * @throws ServerException  if check is made but fails
      */
     protected function checkWhitelist($url)
@@ -470,219 +383,79 @@ class OembedPlugin extends Plugin
         throw new ServerException(sprintf(_('Domain not in remote thumbnail source whitelist: %s'), $host));
     }
 
-    /**
-     * Check the file size of a remote file using a HEAD request and checking
-     * the content-length variable returned.  This isn't 100% foolproof but is
-     * reliable enough for our purposes.
-     *
-     * @return string|bool the file size if it succeeds, false otherwise.
-     */
-    private function getRemoteFileSize($url)
-    {
-        try {
-            if (empty($url)) {
-                return false;
-            }
-            stream_context_set_default(array('http' => array('method' => 'HEAD')));
-            $head = @get_headers($url, 1);
-            if (gettype($head)=="array") {
-                $head = array_change_key_case($head);
-                $size = isset($head['content-length']) ? $head['content-length'] : 0;
-
-                if (!$size) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-            return $size; // return formatted size
-        } catch (Exception $err) {
-            common_log(LOG_ERR, __CLASS__.': getRemoteFileSize on URL : '._ve($url).' threw exception: '.$err->getMessage());
-            return false;
-        }
-    }
-
-    /**
-     * A private helper function that uses a CURL lookup to check the mime type
-     * of a remote URL to see it it's an image.
-     *
-     * @return bool true if the remote URL is an image, or false otherwise.
-     */
-    private function isRemoteImage($url)
-    {
-        if (!filter_var($url, FILTER_VALIDATE_URL)) {
-            common_log(LOG_ERR, "Invalid URL in OEmbed::isRemoteImage()");
-            return false;
-        }
-        if ($url==null) {
-            common_log(LOG_ERR, "URL not specified in OEmbed::isRemoteImage()");
-            return false;
-        }
-        try {
-            $curl = curl_init($url);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($curl, CURLOPT_HEADER, true);
-            curl_setopt($curl, CURLOPT_NOBODY, true);
-            curl_exec($curl);
-            $type    = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
-            if (strpos($type, 'image') !== false) {
-                return true;
-            } else {
-                return false;
-            }
-        } finally {
-            return false;
-        }
-    }
-
-    /**
-     * Creates a dummy image with dimensions of original image in order to cheat
-     * core GNU social file handler. Used by remove_original.
-     *
-     * @author Diogo Cordeiro <diogo@fc.up.pt>
-     * @param int $width Image's width
-     * @param int $height Image's height
-     * @return string dummy file's filename
-     */
-    private function create_dummy($width, $height)
-    {
-        $filename = "oembed-dummy-{$width}-{$height}.png";
-        $filepath = File_thumbnail::path($filename);
-        if (file_exists($filepath)) {
-            return $filename;
-        }
-
-        $im = @imagecreate($width, $height)
-           || exit('Cannot Initialize new GD image stream');
-        imagecolorallocate($im, 0, 0, 0);
-        imagepng($im, File_thumbnail::path ($filename));
-        imagedestroy($im);
-
-        return $filename;
-    }
-
-    /**
-     * Removes the original thumbnail and updates the entry on database to the
-     * dummy object. Depends on create_dummy.
-     *
-     * @author Diogo Cordeiro <diogo@fc.up.pt>
-     * @param File_thumbnail $thumbnail object containing the file thumbnail
-     * @return bool true if had to remove, false if it was already all okay
-     */
-    private function remove_original($thumbnail)
-    {
-        // Do not remove when original is needed
-        if ($this->keep_original ||
-            (isset($config['thumbnail']) &&
-             ($config['thumbnail']['width']  <= $thumbnail->width) &&
-             ($config['thumbnail']['height'] <= $thumbnail->height))
-           ) {
-            return false;
-        }
-
-        $dummy_filename = $this->create_dummy($thumbnail->width, $thumbnail->height);
-        if ($thumbnail->filename == $dummy_filename) {
-            return false;
-        }
-        $original_filepath = File_thumbnail::path($thumbnail->filename);
-        unlink($original_filepath);
-
-        $orig = clone ($thumbnail);
-        $thumbnail->filename = $dummy_filename;
-        // Throws exception on failure.
-        $thumbnail->updateWithKeys($orig);
-
-        return true;
-    }
-
-    /**
-     * Function to create and store a thumbnail representation of a remote image
-     *
-     * @param $thumbnail File_thumbnail object containing the file thumbnail
-     * @return bool true if it succeeded, the exception if it fails, or false if it
-     * is limited by system limits (ie the file is too large.)
-     */
     protected function storeRemoteFileThumbnail(File_thumbnail $thumbnail)
     {
         if (!empty($thumbnail->filename) && file_exists($thumbnail->getPath())) {
-            $this->remove_original($thumbnail);
-            throw new AlreadyFulfilledException(sprintf('A thumbnail seems to already exist for remote file with id==%u', $thumbnail->file_id));
+            throw new AlreadyFulfilledException(sprintf('A thumbnail seems to already exist for remote file with id==%u', $thumbnail->getFileId()));
         }
 
-        $url = $thumbnail->getUrl();
-        $this->checkWhitelist($url);
+        $remoteUrl = $thumbnail->getUrl();
+        $this->checkWhitelist($remoteUrl);
 
-        try {
-            $isImage = $this->isRemoteImage($url);
-            if ($isImage==true) {
-                $max_size  = common_get_preferred_php_upload_limit();
-                $file_size = $this->getRemoteFileSize($url);
-                if (($file_size!=false) && ($file_size > $max_size)) {
-                    common_debug("Went to store remote thumbnail of size " . $file_size . " but the upload limit is " . $max_size . " so we aborted.");
-                    return false;
-                }
-            }
-        } catch (Exception $err) {
-            common_debug("Could not determine size of remote image, aborted local storage.");
-            return $err;
+        $http = new HTTPClient();
+        // First see if it's too large for us
+        common_debug(__METHOD__ . ': '.sprintf('Performing HEAD request for remote file id==%u to avoid unnecessarily downloading too large files. URL: %s', $thumbnail->getFileId(), $remoteUrl));
+        $head = $http->head($remoteUrl);
+        if (!$head->isOk()) {
+            common_log(LOG_WARNING, 'HEAD request returned HTTP failure, so we will abort now and delete the thumbnail object.');
+            $thumbnail->delete();
+            return false;
+        } else {
+            common_debug('HEAD request returned HTTP success, so we will continue.');
+        }
+        $remoteUrl = $head->getEffectiveUrl();   // to avoid going through redirects again
+
+        $headers = $head->getHeader();
+        $filesize = isset($headers['content-length']) ? $headers['content-length'] : null;
+
+        // FIXME: I just copied some checks from StoreRemoteMedia, maybe we should have other checks for thumbnails? Or at least embed into some class somewhere.
+        if (empty($filesize)) {
+            // file size not specified on remote server
+            common_debug(sprintf('%s: Ignoring remote thumbnail because we did not get a content length for thumbnail for file id==%u', __CLASS__, $thumbnail->getFileId()));
+            return true;
+        } elseif ($filesize > common_config('attachments', 'file_quota')) {
+            // file too big according to site configuration
+            common_debug(sprintf('%s: Skip downloading remote thumbnail because content length (%u) is larger than file_quota (%u) for file id==%u', __CLASS__, intval($filesize), common_config('attachments', 'file_quota'), $thumbnail->getFileId()));
+            return true;
         }
 
-        // First we download the file to memory and test whether it's actually an image file
+        // Then we download the file to memory and test whether it's actually an image file
         // FIXME: To support remote video/whatever files, this needs reworking.
-        common_debug(sprintf('Downloading remote thumbnail for file id==%u with thumbnail URL: %s', $thumbnail->file_id, $url));
-        $imgData = HTTPClient::quickGet($url);
+        common_debug(sprintf('Downloading remote thumbnail for file id==%u (should be size %u) with effective URL: %s', $thumbnail->getFileId(), $filesize, _ve($remoteUrl)));
+        $imgData = HTTPClient::quickGet($remoteUrl);
         $info = @getimagesizefromstring($imgData);
         if ($info === false) {
-            throw new UnsupportedMediaException(_('Remote file format was not identified as an image.'), $url);
+            throw new UnsupportedMediaException(_('Remote file format was not identified as an image.'), $remoteUrl);
         } elseif (!$info[0] || !$info[1]) {
             throw new UnsupportedMediaException(_('Image file had impossible geometry (0 width or height)'));
         }
 
         $ext = File::guessMimeExtension($info['mime']);
 
-        try {
-            // We'll trust sha256 (File::FILEHASH_ALG) not to have collision issues any time soon :)
-            $filename = sprintf('oembed-%d.%s', hash(File::FILEHASH_ALG, $imgData), $ext);
-            $fullpath = File_thumbnail::path($filename);
-            // Write the file to disk. Throw Exception on failure
-            if (!file_exists($fullpath) && file_put_contents($fullpath, $imgData) === false) {
-                throw new ServerException(_('Could not write downloaded file to disk.'));
-            }
-        } catch (Exception $err) {
-            common_log(LOG_ERROR, "Went to write a thumbnail to disk in OembedPlugin::storeRemoteThumbnail but encountered error: {$err}");
-            return $err;
-        } finally {
-            unset($imgData);
+        $filename = sprintf('oembed-%d.%s', $thumbnail->getFileId(), $ext);
+        $fullpath = File_thumbnail::path($filename);
+        // Write the file to disk. Throw Exception on failure
+        if (!file_exists($fullpath) && file_put_contents($fullpath, $imgData) === false) {
+            throw new ServerException(_('Could not write downloaded file to disk.'));
         }
+        // Get rid of the file from memory
+        unset($imgData);
 
-        try {
-            // Updated our database for the file record
-            $orig = clone($thumbnail);
-            $thumbnail->filename = $filename;
-            $thumbnail->width = $info[0];    // array indexes documented on php.net:
-            $thumbnail->height = $info[1];   // https://php.net/manual/en/function.getimagesize.php
-            // Throws exception on failure.
-            $thumbnail->updateWithKeys($orig);
-        } catch (exception $err) {
-            common_log(LOG_ERROR, "Went to write a thumbnail entry to the database in OembedPlugin::storeRemoteThumbnail but encountered error: ".$err);
-            return $err;
-        }
-        return true;
+        // Updated our database for the file record
+        $orig = clone($thumbnail);
+        $thumbnail->filename = $filename;
+        $thumbnail->width = $info[0];    // array indexes documented on php.net:
+        $thumbnail->height = $info[1];   // https://php.net/manual/en/function.getimagesize.php
+        // Throws exception on failure.
+        $thumbnail->updateWithKeys($orig);
     }
 
-    /**
-     * Event raised when GNU social polls the plugin for information about it.
-     * Adds this plugin's version information to $versions array
-     *
-     * @param &$versions array inherited from parent
-     * @return bool true hook value
-     */
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Oembed',
                             'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
-                            'homepage' => 'http://gnu.io/social/',
+                            'homepage' => 'http://gnu.io/',
                             'description' =>
                             // TRANS: Plugin description.
                             _m('Plugin for using and representing Oembed data.'));

plugins/Oembed/README

@@ -13,7 +13,6 @@ height: Maximum height of the thumbnail in pixels.
 show_html: Whether to show HTML oEmbed data.
 domain_whitelist: Array of regular expressions. Always escape your dots and end your strings.
 check_whitelist: Whether to check the domain_whitelist.
-keep_original: Whether to keep original image or not.
 
 Example
 =======

plugins/Oembed/actions/oembed.php

@@ -1,41 +1,42 @@
 <?php
-// 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 <http://www.gnu.org/licenses/>.
-
 /**
- * OembedPlugin implementation for GNU social
+ * StatusNet, the distributed open-source microblogging tool
  *
- * @package   GNUsocial
- * @author    Craig Andrews <candrews@integralblue.com>
- * @author    Mikael Nordfeldth <mmn@hethane.se>
- * @author    hannes
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ * oEmbed data action for /main/oembed(.xml|.json) requests
+ *
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
-defined('GNUSOCIAL') || die();
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Oembed provider implementation
  *
  * This class handles all /main/oembed(.xml|.json)/ requests.
  *
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ * @category  oEmbed
+ * @package   GNUsocial
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2008 StatusNet, Inc.
+ * @copyright 2014 Free Software Foundation, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
  */
+
 class OembedAction extends Action
 {
     protected function handle()
@@ -46,12 +47,12 @@ class OembedAction extends Action
         $tls = parse_url($url, PHP_URL_SCHEME) == 'https';
         $root_url = common_root_url($tls);
 
-        if (substr(strtolower($url), 0, mb_strlen($root_url)) !== strtolower($root_url)) {
+        if (substr(strtolower($url),0,mb_strlen($root_url)) !== strtolower($root_url)) {
             // TRANS: Error message displaying attachments. %s is the site's base URL.
             throw new ClientException(sprintf(_('oEmbed data will only be provided for %s URLs.'), $root_url));
         }
 
-        $path = substr($url, strlen($root_url));
+        $path = substr($url,strlen($root_url));
 
         $r = Router::get();
 
@@ -74,17 +75,15 @@ class OembedAction extends Action
             $profile = $notice->getProfile();
             $authorname = $profile->getFancyName();
             // TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
-            $oembed['title'] = sprintf(
-                _('%1$s\'s status on %2$s'),
+            $oembed['title'] = sprintf(_('%1$s\'s status on %2$s'),
                 $authorname,
-                common_exact_date($notice->created)
-            );
+                common_exact_date($notice->created));
             $oembed['author_name']=$authorname;
             $oembed['author_url']=$profile->profileurl;
             $oembed['url']=$notice->getUrl();
             $oembed['html']=$notice->getRendered();
 
-            // maybe add thumbnail
+			// maybe add thumbnail
             foreach ($notice->attachments() as $attachment) {
                 if (!$attachment instanceof File) {
                     common_debug('ATTACHMENTS array entry from notice id=='._ve($notice->getID()).' is something else than a File dataobject: '._ve($attachment));
@@ -109,10 +108,10 @@ class OembedAction extends Action
         case 'attachment':
             $id = $proxy_args['attachment'];
             $attachment = File::getKV($id);
-            if (empty($attachment)) {
+            if(empty($attachment)){
                 // TRANS: Client error displayed in oEmbed action when attachment not found.
                 // TRANS: %d is an attachment ID.
-                $this->clientError(sprintf(_('Attachment %s not found.'), $id), 404);
+                $this->clientError(sprintf(_('Attachment %s not found.'),$id), 404);
             }
             if (empty($attachment->filename) && $file_oembed = File_oembed::getKV('file_id', $attachment->id)) {
                 // Proxy the existing oembed information
@@ -126,7 +125,7 @@ class OembedAction extends Action
                 $oembed['author_name']=$file_oembed->author_name;
                 $oembed['author_url']=$file_oembed->author_url;
                 $oembed['url']=$file_oembed->getUrl();
-            } elseif (substr($attachment->mimetype, 0, strlen('image/'))==='image/') {
+            } elseif (substr($attachment->mimetype,0,strlen('image/'))==='image/') {
                 $oembed['type']='photo';
                 if ($attachment->filename) {
                     $filepath = File::path($attachment->filename);
@@ -150,10 +149,8 @@ class OembedAction extends Action
                 }
             } else {
                 $oembed['type']='link';
-                $oembed['url']=common_local_url(
-                    'attachment',
-                    array('attachment' => $attachment->id)
-                );
+                $oembed['url']=common_local_url('attachment',
+                    array('attachment' => $attachment->id));
             }
             if ($attachment->title) {
                 $oembed['title']=$attachment->title;
@@ -162,14 +159,14 @@ class OembedAction extends Action
         default:
             // TRANS: Server error displayed in oEmbed request when a path is not supported.
             // TRANS: %s is a path.
-            $this->serverError(sprintf(_('"%s" not supported for oembed requests.'), $path), 501);
+            $this->serverError(sprintf(_('"%s" not supported for oembed requests.'),$path), 501);
         }
 
         switch ($this->trimmed('format')) {
         case 'xml':
             $this->init_document('xml');
             $this->elementStart('oembed');
-            foreach (array(
+            foreach(array(
                         'version', 'type', 'provider_name',
                         'provider_url', 'title', 'author_name',
                         'author_url', 'url', 'html', 'width',
@@ -247,7 +244,7 @@ class OembedAction extends Action
      *
      * @return boolean is read only action?
      */
-    public function isReadOnly($args)
+    function isReadOnly($args)
     {
         return true;
     }

plugins/Oembed/classes/File_oembed.php

@@ -1,38 +1,28 @@
 <?php
-// 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 <http://www.gnu.org/licenses/>.
-
-/**
- * OembedPlugin implementation for GNU social
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
- * @package   GNUsocial
- * @author    Stephen Paul Weber
- * @author    Mikael Nordfeldth
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
-defined('GNUSOCIAL') || die();
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Table Definition for file_oembed
- *
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
+
 class File_oembed extends Managed_DataObject
 {
     public $__table = 'file_oembed';                     // table name
@@ -77,8 +67,7 @@ class File_oembed extends Managed_DataObject
         );
     }
 
-    public static function _getOembed($url)
-    {
+    static function _getOembed($url) {
         try {
             return oEmbedHelper::getObject($url);
         } catch (Exception $e) {
@@ -90,8 +79,7 @@ class File_oembed extends Managed_DataObject
     /**
      * Fetch an entry by using a File's id
      */
-    public static function getByFile(File $file)
-    {
+    static function getByFile(File $file) {
         $fo = new File_oembed();
         $fo->file_id = $file->id;
         if (!$fo->find(true)) {
@@ -111,8 +99,7 @@ class File_oembed extends Managed_DataObject
      * @param object $data Services_oEmbed_Object_*
      * @param int $file_id
      */
-    public static function saveNew($data, $file_id)
-    {
+    public static function saveNew($data, $file_id) {
         $file_oembed = new File_oembed;
         $file_oembed->file_id = $file_id;
         if (!isset($data->version)) {
@@ -120,37 +107,19 @@ class File_oembed extends Managed_DataObject
         }
         $file_oembed->version = $data->version;
         $file_oembed->type = $data->type;
-        if (!empty($data->provider_name)) {
-            $file_oembed->provider = $data->provider_name;
-        }
-        if (!empty($data->provider)) {
-            $file_oembed->provider = $data->provider;
-        }
-        if (!empty($data->provider_url)) {
-            $file_oembed->provider_url = $data->provider_url;
-        }
-        if (!empty($data->width)) {
-            $file_oembed->width = intval($data->width);
-        }
-        if (!empty($data->height)) {
-            $file_oembed->height = intval($data->height);
-        }
-        if (!empty($data->html)) {
-            $file_oembed->html = $data->html;
-        }
-        if (!empty($data->title)) {
-            $file_oembed->title = $data->title;
-        }
-        if (!empty($data->author_name)) {
-            $file_oembed->author_name = $data->author_name;
-        }
-        if (!empty($data->author_url)) {
-            $file_oembed->author_url = $data->author_url;
-        }
-        if (!empty($data->url)) {
+        if (!empty($data->provider_name)) $file_oembed->provider = $data->provider_name;
+        if (!empty($data->provider)) $file_oembed->provider = $data->provider;
+        if (!empty($data->provider_url)) $file_oembed->provider_url = $data->provider_url;
+        if (!empty($data->width)) $file_oembed->width = intval($data->width);
+        if (!empty($data->height)) $file_oembed->height = intval($data->height);
+        if (!empty($data->html)) $file_oembed->html = $data->html;
+        if (!empty($data->title)) $file_oembed->title = $data->title;
+        if (!empty($data->author_name)) $file_oembed->author_name = $data->author_name;
+        if (!empty($data->author_url)) $file_oembed->author_url = $data->author_url;
+        if (!empty($data->url)){
             $file_oembed->url = $data->url;
             $given_url = File_redirection::_canonUrl($file_oembed->url);
-            if (! empty($given_url)) {
+            if (! empty($given_url)){
                 try {
                     $file = File::getByUrl($given_url);
                     $file_oembed->mimetype = $file->mimetype;
@@ -170,11 +139,8 @@ class File_oembed extends Managed_DataObject
         if (!empty($data->thumbnail_url) || ($data->type == 'photo')) {
             $ft = File_thumbnail::getKV('file_id', $file_id);
             if ($ft instanceof File_thumbnail) {
-                common_log(
-                    LOG_WARNING,
-                    "Strangely, a File_thumbnail object exists for new file $file_id",
-                    __FILE__
-                );
+                common_log(LOG_WARNING, "Strangely, a File_thumbnail object exists for new file $file_id",
+                           __FILE__);
             } else {
                 File_thumbnail::saveNew($data, $file_id);
             }

plugins/Oembed/lib/oembedhelper.php

@@ -1,31 +1,24 @@
 <?php
-// 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 <http://www.gnu.org/licenses/>.
-
-/**
- * OembedPlugin implementation for GNU social
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2010, StatusNet, Inc.
  *
- * @package   GNUsocial
- * @author    Mikael Nordfeldth
- * @author    hannes
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
-defined('GNUSOCIAL') || die();
+if (!defined('GNUSOCIAL')) { exit(1); }
+
 
 /**
  * Utility class to wrap basic oEmbed lookups.
@@ -42,9 +35,6 @@ defined('GNUSOCIAL') || die();
  * Others will fall back to oohembed (unless disabled).
  * The API endpoint can be configured or disabled through config
  * as 'oohembed'/'endpoint'.
- *
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 class oEmbedHelper
 {
@@ -97,38 +87,36 @@ class oEmbedHelper
             // DOMDocument::loadHTML may throw warnings on unrecognized elements,
             // and notices on unrecognized namespaces.
             $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
-
+            
             // DOMDocument assumes ISO-8859-1 per HTML spec
             // use UTF-8 if we find any evidence of that encoding
             $utf8_evidence = false;
             $unicode_check_dom = new DOMDocument();
             $ok = $unicode_check_dom->loadHTML($body);
-            if (!$ok) {
-                throw new oEmbedHelper_BadHtmlException();
-            }
+            if (!$ok) throw new oEmbedHelper_BadHtmlException();
             $metaNodes = $unicode_check_dom->getElementsByTagName('meta');
-            foreach ($metaNodes as $metaNode) {
+            foreach($metaNodes as $metaNode) {
                 // case in-sensitive since Content-type and utf-8 can be written in many ways
-                if (stristr($metaNode->getAttribute('http-equiv'), 'content-type')
-                && stristr($metaNode->getAttribute('content'), 'utf-8')) {
-                    $utf8_evidence = true;
-                    break;
-                } elseif (stristr($metaNode->getAttribute('charset'), 'utf-8')) {
-                    $utf8_evidence = true;
+                if(stristr($metaNode->getAttribute('http-equiv'),'content-type')
+                && stristr($metaNode->getAttribute('content'),'utf-8')) {
+                    $utf8_evidence = true;        
+                    break;                  
+                } elseif(stristr($metaNode->getAttribute('charset'),'utf-8')) {
+                    $utf8_evidence = true;        
                     break;
                 }
             }
             unset($unicode_check_dom);
-
+            
             // The Content-Type HTTP response header overrides encoding metatags in DOM
-            if (stristr($response->getHeader('Content-Type'), 'utf-8')) {
-                $utf8_evidence = true;
+            if(stristr($response->getHeader('Content-Type'),'utf-8')) {
+                $utf8_evidence = true;              
             }
-
-            // add utf-8 encoding prolog if we have reason to believe this is utf-8 content
-            // DOMDocument('1.0', 'UTF-8') does not work!
-            $utf8_tag = $utf8_evidence ? '<?xml encoding="utf-8" ?>' : '';
-
+           
+            // add utf-8 encoding prolog if we have reason to believe this is utf-8 content   
+            // DOMDocument('1.0', 'UTF-8') does not work!            
+            $utf8_tag = $utf8_evidence ? '<?xml encoding="utf-8" ?>' : '';          
+            
             $dom = new DOMDocument();
             $ok = $dom->loadHTML($utf8_tag.$body);
             unset($body);   // storing the DOM in memory is enough...
@@ -137,7 +125,7 @@ class oEmbedHelper
             if (!$ok) {
                 throw new oEmbedHelper_BadHtmlException();
             }
-
+            
             Event::handle('GetRemoteUrlMetadataFromDom', array($url, $dom, &$metadata));
         }
 
@@ -151,7 +139,7 @@ class oEmbedHelper
      * @param string $body HTML body text
      * @return mixed string with URL or false if no target found
      */
-    public static function oEmbedEndpointFromHTML(DOMDocument $dom)
+    static function oEmbedEndpointFromHTML(DOMDocument $dom)
     {
         // Ok... now on to the links!
         $feeds = array(
@@ -196,7 +184,7 @@ class oEmbedHelper
      * @param array $params
      * @return object
      */
-    public static function getOembedFrom($api, $url, $params=array())
+    static function getOembedFrom($api, $url, $params=array())
     {
         if (empty($api)) {
             // TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
@@ -204,16 +192,16 @@ class oEmbedHelper
         }
         $params['url'] = $url;
         $params['format'] = 'json';
-        $key=common_config('oembed', 'apikey');
-        if (isset($key)) {
-            $params['key'] = common_config('oembed', 'apikey');
+        $key=common_config('oembed','apikey');
+        if(isset($key)) {
+            $params['key'] = common_config('oembed','apikey');
         }
-
+        
         $oembed_data = HTTPClient::quickGetJson($api, $params);
         if (isset($oembed_data->html)) {
             $oembed_data->html = common_purify($oembed_data->html);
         }
-
+        
         return $oembed_data;
     }
 
@@ -223,7 +211,7 @@ class oEmbedHelper
      * @param object $orig
      * @return object
      */
-    public static function normalize(stdClass $data)
+    static function normalize(stdClass $data)
     {
         if (empty($data->type)) {
             throw new Exception('Invalid oEmbed data: no type field.');
@@ -255,7 +243,7 @@ class oEmbedHelper_Exception extends Exception
 
 class oEmbedHelper_BadHtmlException extends oEmbedHelper_Exception
 {
-    public function __construct($previous=null)
+    function __construct($previous=null)
     {
         return parent::__construct('Bad HTML in discovery data.', 0, $previous);
     }
@@ -263,7 +251,7 @@ class oEmbedHelper_BadHtmlException extends oEmbedHelper_Exception
 
 class oEmbedHelper_DiscoveryException extends oEmbedHelper_Exception
 {
-    public function __construct($previous=null)
+    function __construct($previous=null)
     {
         return parent::__construct('No oEmbed discovery data.', 0, $previous);
     }

plugins/Oembed/lib/opengraphhelper.php

@@ -1,36 +1,10 @@
 <?php
-// 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 <http://www.gnu.org/licenses/>.
 
-/**
- * OembedPlugin implementation for GNU social
- *
- * @package   GNUsocial
- * @author    Mikael Nordfeldth
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
+if (!defined('GNUSOCIAL')) { exit(1); }
 
-defined('GNUSOCIAL') || die();
 
 /**
  * Utility class to get OpenGraph data from HTML DOMs etc.
- *
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 class OpenGraphHelper
 {
@@ -52,8 +26,7 @@ class OpenGraphHelper
                             '/^image/'     => 'photo',
                             ];
 
-    public static function ogFromHtml(DOMDocument $dom)
-    {
+    static function ogFromHtml(DOMDocument $dom) {
         $obj = new stdClass();
         $obj->version = '1.0';  // fake it til u make it
 

plugins/Oembed/locale/Oembed.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-10 00:39+0100\n"
+"POT-Creation-Date: 2019-06-08 18:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Plugin description.
-#: OembedPlugin.php:721
+#: OembedPlugin.php:461
 msgid "Plugin for using and representing Oembed data."
 msgstr ""
 
 #. TRANS: Exception. %s is the URL we tried to GET.
-#: lib/oembedhelper.php:93
+#: lib/oembedhelper.php:83
 #, php-format
 msgid "Could not GET URL %s."
 msgstr ""

plugins/Oembed/scripts/fixup_files.php

@@ -1,33 +1,24 @@
 #!/usr/bin/env php
 <?php
-// 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 <http://www.gnu.org/licenses/>.
-
-/**
- * OembedPlugin implementation for GNU social
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010 StatusNet, Inc.
  *
- * @package   GNUsocial
- * @author    Mikael Nordfeldth
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
-defined('GNUSOCIAL') || die();
-
-define('INSTALLDIR', realpath(__DIR__ . '/../../..'));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
 $longoptions = array('dry-run');
 
@@ -63,15 +54,13 @@ while ($f->fetch()) {
         }
     } else {
         // NULL out the mime/title/size/protected fields
-        $sql = sprintf(
-            "UPDATE file " .
+        $sql = sprintf("UPDATE file " .
                        "SET mimetype=null,title=null,size=null,protected=null " .
                        "WHERE id=%d",
-            $f->id
-        );
+                       $f->id);
         $f->query($sql);
         $f->decache();
-
+        
         if (is_array($data)) {
             Event::handle('EndFileSaveNew', array($f, $data, $f->url));
             echo " (ok)\n";
@@ -82,3 +71,4 @@ while ($f->fetch()) {
 }
 
 echo "done.\n";
+

plugins/Oembed/scripts/poll_oembed.php

@@ -1,33 +1,7 @@
 #!/usr/bin/env php
 <?php
-// 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 <http://www.gnu.org/licenses/>.
 
-/**
- * OembedPlugin implementation for GNU social
- *
- * @package   GNUsocial
- * @author    Mikael Nordfeldth
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-
-defined('GNUSOCIAL') || die();
-
-define('INSTALLDIR', realpath(__DIR__ . '/../../..'));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
 $shortoptions = 'u:';
 $longoptions = array('url=');

plugins/Oembed/tests/oEmbedTest.php

@@ -1,35 +1,11 @@
 <?php
-// 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 <http://www.gnu.org/licenses/>.
-
-/**
- * OembedPlugin implementation for GNU social
- *
- * @package   GNUsocial
- * @author    Mikael Nordfeldth
- * @author    Diogo Cordeiro <diogo@fc.up.pt>
- * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
 
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     print "This script must be run from the command line\n";
     exit();
 }
 
-define('INSTALLDIR', realpath(__DIR__ . '/../../..'));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 
@@ -37,6 +13,7 @@ require_once INSTALLDIR . '/lib/common.php';
 
 class oEmbedTest extends PHPUnit_Framework_TestCase
 {
+
     public function setup()
     {
         $this->old_ohembed = common_config('ohembed', 'endpoint');
@@ -74,11 +51,10 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
      *
      * @return string
      */
-    public function _endpoint()
+    function _endpoint()
     {
         $default = array();
-        $_server = 'localhost';
-        $_path = '';
+        $_server = 'localhost'; $_path = '';
         require INSTALLDIR . '/lib/default.php';
         return $default['oembed']['endpoint'];
     }
@@ -89,7 +65,7 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
      * @param string $url
      * @param string $expectedType
      */
-    public function _doTest($url, $expectedType)
+    function _doTest($url, $expectedType)
     {
         try {
             $data = oEmbedHelper::getObject($url);
@@ -98,7 +74,7 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
                 $this->assertTrue(!empty($data->url), 'Photo must have a URL.');
                 $this->assertTrue(!empty($data->width), 'Photo must have a width.');
                 $this->assertTrue(!empty($data->height), 'Photo must have a height.');
-            } elseif ($data->type == 'video') {
+            } else if ($data->type == 'video') {
                 $this->assertTrue(!empty($data->html), 'Video must have embedding HTML.');
                 $this->assertTrue(!empty($data->thumbnail_url), 'Video should have a thumbnail.');
             }
@@ -119,7 +95,7 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
      * Sample oEmbed targets for sites we know ourselves...
      * @return array
      */
-    public static function knownSources()
+    static public function knownSources()
     {
         $sources = array(
             array('https://www.flickr.com/photos/brionv/5172500179/', 'photo'),
@@ -133,7 +109,7 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
      *
      * @return array
      */
-    public static function discoverableSources()
+    static public function discoverableSources()
     {
         $sources = array(
 
@@ -152,8 +128,9 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
      *
      * @return array
      */
-    public static function fallbackSources()
+    static public function fallbackSources()
     {
+
         $sources = array(
             array('https://github.com/git/git/commit/85e9c7e1d42849c5c3084a9da748608468310c0e', 'Github Commit'), // @fixme in future there may be a native provider -- will change to 'photo'
         );

plugins/OpenID/classes/User_openid_prefs.php

@@ -51,7 +51,7 @@ class User_openid_prefs extends Managed_DataObject
     public $user_id;            // The User with the prefs
     public $hide_profile_link;  // Hide the link on the profile block?
     public $created;            // datetime
-    public $modified;           // datetime
+    public $modified;           // timestamp
 
     /**
      * The One True Thingy that must be defined and declared.
@@ -77,13 +77,11 @@ class User_openid_prefs extends Managed_DataObject
                     'type'        => 'datetime',
                     'not null'    => true,
                     'description' => 'date this record was created',
-                    'default'     => 'CURRENT_TIMESTAMP'
                 ],
                 'modified' => [
                     'type'        => 'timestamp',
                     'not null'    => true,
                     'description' => 'date this record was modified',
-                    'default'     => 'CURRENT_TIMESTAMP'
                 ],
             ],
                 'primary key'  => ['user_id'],

scripts/sessiongc.php

@@ -1,24 +1,21 @@
 #!/usr/bin/env php
 <?php
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
+// 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 <http://www.gnu.org/licenses/>.
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
 
 $helptext = <<<END_OF_GC_HELP
 sessiongc.php
@@ -33,4 +30,4 @@ $maxlifetime = ini_get('session.gc_maxlifetime');
 
 print "Deleting sessions older than $maxlifetime seconds.\n";
 
-Session::gc($maxlifetime);
+InternalSessionHandler::gc($maxlifetime);

scripts/upgrade.php

@@ -1,27 +1,36 @@
 #!/usr/bin/env php
 <?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008-2011 StatusNet, Inc.
+// 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 <http://www.gnu.org/licenses/>.
+
+/**
+ * Upgrade database schema and data to latest software and check DB integrity
+ * Usage: php upgrade.php [options]
  *
- * 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 <http://www.gnu.org/licenses/>.
+ * @package   GNUsocial
+ * @author    Bhuvan Krishna <bhuvan@swecha.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2010-2019 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
 
 $shortoptions = 'dfx::';
-$longoptions = array('debug', 'files', 'extensions=');
+$longoptions = ['debug', 'files', 'extensions='];
 
 $helptext = <<<END_OF_UPGRADE_HELP
 php upgrade.php [options]
@@ -68,7 +77,7 @@ function main()
         initGroupProfileId();
         initLocalGroup();
         initNoticeReshare();
-    
+
         initSubscriptionURI();
         initGroupMemberURI();
 
@@ -82,9 +91,9 @@ function main()
 
 function tableDefs()
 {
-	$schema = array();
-	require INSTALLDIR.'/db/core.php';
-	return $schema;
+    $schema = [];
+    require INSTALLDIR . '/db/core.php';
+    return $schema;
 }
 
 function updateSchemaCore()
@@ -124,9 +133,9 @@ function fixupNoticeConversation()
     while ($notice->fetch()) {
         try {
             $cid = null;
-    
+
             $orig = clone($notice);
-    
+
             if (!empty($notice->reply_to)) {
                 $reply = Notice::getKV('id', $notice->reply_to);
 
@@ -201,24 +210,27 @@ function initConversation()
     }
 
     while ($notice->fetch()) {
-
         $id = $notice->conversation;
 
-        $uri = common_local_url('conversation', array('id' => $id));
+        $uri = common_local_url('conversation', ['id' => $id]);
 
         // @fixme db_dataobject won't save our value for an autoincrement
         // so we're bypassing the insert wrappers
         $conv = new Conversation();
-        $sql = "insert into conversation (id,uri,created) values(%d,'%s','%s')";
-        $sql = sprintf($sql,
-                       $id,
-                       $conv->escape($uri),
-                       $conv->escape(common_sql_now()));
+        $sql = "INSERT INTO conversation (id,uri,created) VALUES (%d,'%s','%s')";
+        $sql = sprintf(
+            $sql,
+            $id,
+            $conv->escape($uri),
+            $conv->escape(common_sql_now())
+        );
         $conv->query($sql);
     }
 
     // This is something we should only have to do once unless introducing new, bad code.
-    if (DEBUG) printfnq(sprintf('Storing in config that we have done %s', __METHOD__));
+    if (DEBUG) {
+        printfnq(sprintf('Storing in config that we have done %s', __METHOD__));
+    }
     common_config_set('fix', 'upgrade_initConversation', 1);
 
     printfnq("DONE.\n");
@@ -234,9 +246,12 @@ function fixupConversationURIs()
     if ($conv->find()) {
         $rounds = 0;
         while ($conv->fetch()) {
-            $uri = common_local_url('conversation', array('id' => $conv->id));
-            $sql = sprintf('UPDATE conversation SET uri="%1$s" WHERE id="%2$d";',
-                            $conv->escape($uri), $conv->id);
+            $uri = common_local_url('conversation', ['id' => $conv->id]);
+            $sql = sprintf(
+                'UPDATE conversation SET uri="%1$s" WHERE id="%2$d";',
+                $conv->escape($uri),
+                $conv->id
+            );
             $conv->query($sql);
             if (($conv->N-++$rounds) % 500 == 0) {
                 printfnq(sprintf(' %d items left...', $conv->N-$rounds));
@@ -297,7 +312,7 @@ function initLocalGroup()
     while ($group->fetch()) {
         try {
             // Hack to check for local groups
-            if ($group->getUri() == common_local_url('groupbyid', array('id' => $group->id))) {
+            if ($group->getUri() == common_local_url('groupbyid', ['id' => $group->id])) {
                 $lg = new Local_group();
 
                 $lg->group_id = $group->id;
@@ -323,7 +338,7 @@ function initNoticeReshare()
     }
 
     printfnq("Ensuring all reshares have the correct verb and object-type...");
-    
+
     $notice = new Notice();
     $notice->whereAdd('repeat_of is not null');
     $notice->whereAdd('(verb != "'.ActivityVerb::SHARE.'" OR object_type != "'.ActivityObject::ACTIVITY.'")');
@@ -342,7 +357,9 @@ function initNoticeReshare()
     }
 
     // This is something we should only have to do once unless introducing new, bad code.
-    if (DEBUG) printfnq(sprintf('Storing in config that we have done %s', __METHOD__));
+    if (DEBUG) {
+        printfnq(sprintf('Storing in config that we have done %s', __METHOD__));
+    }
     common_config_set('fix', 'upgrade_initNoticeReshare', 1);
 
     printfnq("DONE.\n");
@@ -359,13 +376,15 @@ function initSubscriptionURI()
         while ($sub->fetch()) {
             try {
                 $sub->decache();
-                $sub->query(sprintf('update subscription '.
-                                    'set uri = "%s" '.
-                                    'where subscriber = %d '.
-                                    'and subscribed = %d',
-                                    $sub->escape(Subscription::newUri($sub->getSubscriber(), $sub->getSubscribed(), $sub->created)),
-                                    $sub->subscriber,
-                                    $sub->subscribed));
+                $sub->query(sprintf(
+                    'UPDATE subscription '.
+                    'SET uri = "%s" '.
+                    'WHERE subscriber = %d '.
+                      'AND subscribed = %d',
+                    $sub->escape(Subscription::newUri($sub->getSubscriber(), $sub->getSubscribed(), $sub->created)),
+                    $sub->subscriber,
+                    $sub->subscribed
+                ));
             } catch (Exception $e) {
                 common_log(LOG_ERR, "Error updated subscription URI: " . $e->getMessage());
             }
@@ -386,15 +405,18 @@ function initGroupMemberURI()
         while ($mem->fetch()) {
             try {
                 $mem->decache();
-                $mem->query(sprintf('update group_member set uri = "%s" '.
-                                    'where profile_id = %d ' . 
-                                    'and group_id = %d ',
-                                    Group_member::newUri(Profile::getByID($mem->profile_id), User_group::getByID($mem->group_id), $mem->created),
-                                    $mem->profile_id,
-                                    $mem->group_id));
+                $mem->query(sprintf(
+                    'UPDATE group_member '.
+                    'SET uri = "%s" '.
+                    'WHERE profile_id = %d ' .
+                      'AND group_id = %d',
+                    Group_member::newUri(Profile::getByID($mem->profile_id), User_group::getByID($mem->group_id), $mem->created),
+                    $mem->profile_id,
+                    $mem->group_id
+                ));
             } catch (Exception $e) {
-                common_log(LOG_ERR, "Error updated membership URI: " . $e->getMessage());  
-          }
+                common_log(LOG_ERR, "Error updated membership URI: " . $e->getMessage());
+            }
         }
     }
 
@@ -407,10 +429,10 @@ function initProfileLists()
 
     $ptag = new Profile_tag();
     $ptag->selectAdd();
-    $ptag->selectAdd('tagger, tag, count(*) as tagged_count');
-    $ptag->whereAdd('NOT EXISTS (SELECT tagger, tagged from profile_list '.
-                    'where profile_tag.tagger = profile_list.tagger '.
-                    'and profile_tag.tag = profile_list.tag)');
+    $ptag->selectAdd('tagger, tag, COUNT(*) AS tagged_count');
+    $ptag->whereAdd('NOT EXISTS (SELECT tagger, tagged FROM profile_list '.
+                    'WHERE profile_tag.tagger = profile_list.tagger '.
+                    'AND profile_tag.tag = profile_list.tag)');
     $ptag->groupBy('tagger, tag');
     $ptag->orderBy('tagger, tag');
 
@@ -423,9 +445,12 @@ function initProfileLists()
             $plist->private  = 0;
             $plist->created  = common_sql_now();
             $plist->modified = $plist->created;
-            $plist->mainpage = common_local_url('showprofiletag',
-                                                array('tagger' => $plist->getTagger()->nickname,
-                                                      'tag'    => $plist->tag));;
+            $plist->mainpage = common_local_url(
+                'showprofiletag',
+                ['tagger' => $plist->getTagger()->nickname,
+                 'tag'    => $plist->tag]
+            );
+            ;
 
             $plist->tagged_count     = $ptag->tagged_count;
             $plist->subscriber_count = 0;
@@ -434,8 +459,11 @@ function initProfileLists()
 
             $orig = clone($plist);
             // After insert since it uses auto-generated ID
-            $plist->uri      = common_local_url('profiletagbyid',
-                                        array('id' => $plist->id, 'tagger_id' => $plist->tagger));
+            $plist->uri = common_local_url(
+                'profiletagbyid',
+                ['id'        => $plist->id,
+                 'tagger_id' => $plist->tagger]
+            );
 
             $plist->update($orig);
         }
@@ -457,25 +485,33 @@ function fixupFileGeometry()
 
     if ($file->find()) {
         while ($file->fetch()) {
-            if (DEBUG) printfnq(sprintf('Found file without width: %s\n', _ve($file->getFilename())));
+            if (DEBUG) {
+                printfnq(sprintf('Found file without width: %s\n', _ve($file->getFilename())));
+            }
 
             // Set file geometrical properties if available
             try {
                 $image = ImageFile::fromFileObject($file);
             } catch (ServerException $e) {
                 // We couldn't make out an image from the file.
-                if (DEBUG) printfnq(sprintf('Could not make an image out of the file.\n'));
+                if (DEBUG) {
+                    printfnq(sprintf('Could not make an image out of the file.\n'));
+                }
                 continue;
             }
             $orig = clone($file);
             $file->width = $image->width;
             $file->height = $image->height;
-            if (DEBUG) printfnq(sprintf('Setting image file and with to %sx%s.\n', $file->width, $file->height));
+            if (DEBUG) {
+                printfnq(sprintf('Setting image file and with to %sx%s.\n', $file->width, $file->height));
+            }
             $file->update($orig);
 
             // FIXME: Do this more automagically inside ImageFile or so.
             if ($image->getPath() != $file->getPath()) {
-                if (DEBUG) printfnq(sprintf('Deleting the temporarily stored ImageFile.\n'));
+                if (DEBUG) {
+                    printfnq(sprintf('Deleting the temporarily stored ImageFile.\n'));
+                }
                 $image->unlink();
             }
             unset($image);
@@ -581,10 +617,10 @@ function migrateProfilePrefs()
 {
     printfnq("Finding and possibly migrating Profile_prefs entries: ");
 
-    $prefs = array();   // ['qvitter' => ['cover_photo'=>'profile_banner_url', ...], ...]
-    Event::handle('GetProfilePrefsMigrations', array(&$prefs));
+    $prefs = [];   // ['qvitter' => ['cover_photo'=>'profile_banner_url', ...], ...]
+    Event::handle('GetProfilePrefsMigrations', [&$prefs]);
 
-    foreach($prefs as $namespace=>$mods) {
+    foreach ($prefs as $namespace=>$mods) {
         echo "$namespace... ";
         assert(is_array($mods));
         $p = new Profile_prefs();

theme/base/css/display.css

@@ -734,6 +734,7 @@ address .poweredby {
     margin-left: 56px;
     max-height: 400px;
     overflow-y: auto;
+    word-wrap: break-word;
 }
 
 .notice .e-content img {